Dev (#18)

* - Refactor SendAsync method signatures for IServiceChannel and their implementations:
This commit simplifies the `SendAsync` method signatures across `DefaultServiceChannel`, `IServiceChannel`, and `ServiceChannelRegistry` by removing generic type parameters for requests and using a single `IServiceRequest<TResponse>`  or  `IServiceRequest` parameter. This change enhances code readability and reduces complexity in method calls.

* - bump version

Author: modabas

Directory.Build.props

@@ -18,6 +18,6 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
 
-    <Version>0.6.7</Version>
+    <Version>0.6.8</Version>
   </PropertyGroup>
 </Project>

README.md

@@ -479,6 +479,6 @@ Then remote services are called with IServiceChannel instance resolved from DI..
   //resolve service channel from DI
   var channel = provider.GetRequiredService<IServiceChannel>();
   //send request over channel to remote service
-  var listResult = await channel.SendAsync<ListStoresRequest, ListStoresResponse>(new ListStoresRequest(), ct);
+  var listResult = await channel.SendAsync(new ListStoresRequest(), ct);
 
 ```

samples/ServiceEndpointClient/Program.cs

@@ -48,22 +48,26 @@ static async Task CallRemoteServicesAsync(IServiceProvider hostProvider)
   //resolve service channel from DI
   var channel = provider.GetRequiredService<IServiceChannel>();
   //send request over channel to remote ServiceResultEndpoint
-  var listResult = await channel.SendAsync<ListStoresRequest, ListStoresResponse>(
+  var listResult = await channel.SendAsync(
     new ListStoresRequest(),
     "v1/storesWithServiceEndpoint/",
     default);
 
   if (listResult.IsOk)
   {
+    Console.WriteLine("***********************");
     Console.WriteLine($"ListStores complete. Total count: {listResult.Value.Stores.Count}");
+    Console.WriteLine("***********************");
     var id = listResult.Value.Stores.FirstOrDefault()?.Id;
     if (id is not null)
     {
       //send request over channel to remote ServiceResultEndpoint
-      var getResult = await channel.SendAsync<GetStoreByIdRequest, GetStoreByIdResponse>(
+      var getResult = await channel.SendAsync(
         new GetStoreByIdRequest(Id: id.Value),
         "v1/storesWithServiceEndpoint/",
         default);
+      Console.WriteLine("***********************");
+      Console.WriteLine("GetStoreById response BEFORE delete:");
       if (getResult.IsOk)
       {
         Console.WriteLine(getResult.Value);
@@ -72,6 +76,34 @@ static async Task CallRemoteServicesAsync(IServiceProvider hostProvider)
       {
         Console.WriteLine(getResult.DumpMessages());
       }
+      Console.WriteLine("***********************");
+
+      //send request over channel to remote ServiceResultEndpoint
+      var deleteResult = await channel.SendAsync(
+        new DeleteStoreRequest(Id: id.Value),
+        "v1/storesWithServiceEndpoint/",
+        default);
+      Console.WriteLine("***********************");
+      Console.WriteLine("DeleteStore response:");
+      Console.WriteLine(deleteResult.DumpMessages());
+      Console.WriteLine("***********************");
+
+      //send request over channel to remote ServiceResultEndpoint
+      getResult = await channel.SendAsync(
+        new GetStoreByIdRequest(Id: id.Value),
+        "v1/storesWithServiceEndpoint/",
+        default);
+      Console.WriteLine("***********************");
+      Console.WriteLine("GetStoreById response AFTER delete:");
+      if (getResult.IsOk)
+      {
+        Console.WriteLine(getResult.Value);
+      }
+      else
+      {
+        Console.WriteLine(getResult.DumpMessages());
+      }
+      Console.WriteLine("***********************");
     }
   }
   else

src/ModEndpoints.RemoteServices/DefaultServiceChannel.cs

@@ -11,22 +11,20 @@ public class DefaultServiceChannel(
 {
   private const string NoChannelRegistrationFound = "No channel registration found for request type {0}.";
 
-  public async Task<Result<TResponse>> SendAsync<TRequest, TResponse>(TRequest req, CancellationToken ct)
-    where TRequest : IServiceRequest<TResponse>
+  public async Task<Result<TResponse>> SendAsync<TResponse>(IServiceRequest<TResponse> req, CancellationToken ct)
     where TResponse : notnull
   {
-    return await SendAsync<TRequest, TResponse>(req, null, ct);
+    return await SendAsync(req, null, ct);
   }
 
-  public async Task<Result<TResponse>> SendAsync<TRequest, TResponse>(
-    TRequest req,
+  public async Task<Result<TResponse>> SendAsync<TResponse>(
+    IServiceRequest<TResponse> req,
     string? endpointUriPrefix,
     CancellationToken ct,
     Func<IServiceProvider, HttpRequestMessage, CancellationToken, Task>? httpRequestInterceptor = null,
     Func<IServiceProvider, HttpResponseMessage, CancellationToken, Task>? httpResponseInterceptor = null,
     string? uriResolverName = null,
     string? serializerName = null)
-    where TRequest : IServiceRequest<TResponse>
     where TResponse : notnull
   {
     try
@@ -42,9 +40,10 @@ public async Task<Result<TResponse>> SendAsync<TRequest, TResponse>(
         {
           return Result<TResponse>.Fail(requestUriResult);
         }
-        if (!ServiceChannelRegistry.Instance.IsRequestRegistered<TRequest>(out var clientName))
+        var requestType = req.GetType();
+        if (!ServiceChannelRegistry.Instance.IsRequestRegistered(requestType, out var clientName))
         {
-          return Result<TResponse>.CriticalError(string.Format(NoChannelRegistrationFound, typeof(TRequest)));
+          return Result<TResponse>.CriticalError(string.Format(NoChannelRegistrationFound, requestType));
         }
         using (HttpRequestMessage httpReq = new(
           HttpMethod.Post,
@@ -73,20 +72,19 @@ public async Task<Result<TResponse>> SendAsync<TRequest, TResponse>(
     }
   }
 
-  public async Task<Result> SendAsync<TRequest>(TRequest req, CancellationToken ct) where TRequest : IServiceRequest
+  public async Task<Result> SendAsync(IServiceRequest req, CancellationToken ct)
   {
-    return await SendAsync<TRequest>(req, null, ct);
+    return await SendAsync(req, null, ct);
   }
 
-  public async Task<Result> SendAsync<TRequest>(
-    TRequest req,
+  public async Task<Result> SendAsync(
+    IServiceRequest req,
     string? endpointUriPrefix,
     CancellationToken ct,
     Func<IServiceProvider, HttpRequestMessage, CancellationToken, Task>? httpRequestInterceptor = null,
     Func<IServiceProvider, HttpResponseMessage, CancellationToken, Task>? httpResponseInterceptor = null,
     string? uriResolverName = null,
     string? serializerName = null)
-    where TRequest : IServiceRequest
   {
     try
     {
@@ -101,9 +99,10 @@ public async Task<Result> SendAsync<TRequest>(
         {
           return Result.Fail(requestUriResult);
         }
-        if (!ServiceChannelRegistry.Instance.IsRequestRegistered<TRequest>(out var clientName))
+        var requestType = req.GetType();
+        if (!ServiceChannelRegistry.Instance.IsRequestRegistered(requestType, out var clientName))
         {
-          return Result.CriticalError(string.Format(NoChannelRegistrationFound, typeof(TRequest)));
+          return Result.CriticalError(string.Format(NoChannelRegistrationFound, requestType));
         }
         using (HttpRequestMessage httpReq = new(
           HttpMethod.Post,

src/ModEndpoints.RemoteServices/DefaultServiceChannelSerializer.cs

@@ -28,7 +28,7 @@ public ValueTask<HttpContent> CreateContentAsync<TRequest>(
   {
     return new ValueTask<HttpContent>(
       JsonContent.Create(
-        request,
+        (object)request,
         null,
         options.SerializationOptions));
   }

src/ModEndpoints.RemoteServices/IServiceChannel.cs

@@ -11,21 +11,18 @@ public interface IServiceChannel
   /// <summary>
   /// Sends request to remote service endpoint.
   /// </summary>
-  /// <typeparam name="TRequest">Type of ServiceEndpoint request that will be sent.</typeparam>
   /// <typeparam name="TResponse">ServiceEndpoint response type.</typeparam>
   /// <param name="req">Request to be sent.</param>
   /// <param name="ct">The <see cref="CancellationToken"/> to cancel operation.</param>
   /// <returns>Response of remote service endpoint or failure result.</returns>
-  Task<Result<TResponse>> SendAsync<TRequest, TResponse>(
-    TRequest req,
+  Task<Result<TResponse>> SendAsync<TResponse>(
+    IServiceRequest<TResponse> req,
     CancellationToken ct)
-    where TRequest : IServiceRequest<TResponse>
     where TResponse : notnull;
 
   /// <summary>
   /// Sends request to remote service endpoint.
   /// </summary>
-  /// <typeparam name="TRequest">Type of ServiceEndpoint request that will be sent.</typeparam>
   /// <typeparam name="TResponse">ServiceEndpoint response type.</typeparam>
   /// <param name="req">Request to be sent.</param>
   /// <param name="endpointUriPrefix">Path to append as prefix to resolved enpoint uri. Usually used to add path segments to configured client's base address.</param>
@@ -35,33 +32,29 @@ Task<Result<TResponse>> SendAsync<TRequest, TResponse>(
   /// <param name="uriResolverName"><see cref="IServiceEndpointUriResolver"/> name to be used to resolve ServiceEnpoint Uri.</param>
   /// <param name="serializerName"><see cref="IServiceChannelSerializer"/> name to be used to resolve ServiceEnpoint Uri.</param>
   /// <returns>Response of remote service endpoint or failure result.</returns>
-  Task<Result<TResponse>> SendAsync<TRequest, TResponse>(
-    TRequest req,
+  Task<Result<TResponse>> SendAsync<TResponse>(
+    IServiceRequest<TResponse> req,
     string? endpointUriPrefix,
     CancellationToken ct,
     Func<IServiceProvider, HttpRequestMessage, CancellationToken, Task>? httpRequestInterceptor = null,
     Func<IServiceProvider, HttpResponseMessage, CancellationToken, Task>? httpResponseInterceptor = null,
     string? uriResolverName = null,
     string? serializerName = null)
-    where TRequest : IServiceRequest<TResponse>
     where TResponse : notnull;
 
   /// <summary>
   /// Sends request to remote service endpoint.
   /// </summary>
-  /// <typeparam name="TRequest">Type of ServiceEndpoint request that will be sent.</typeparam>
   /// <param name="req">Request to be sent.</param>
   /// <param name="ct">The <see cref="CancellationToken"/> to cancel operation.</param>
   /// <returns>Response of remote service endpoint or failure result.</returns>
-  Task<Result> SendAsync<TRequest>(
-    TRequest req,
-    CancellationToken ct)
-    where TRequest : IServiceRequest;
+  Task<Result> SendAsync(
+    IServiceRequest req,
+    CancellationToken ct);
 
   /// <summary>
   /// Sends request to remote service endpoint.
   /// </summary>
-  /// <typeparam name="TRequest">Type of ServiceEndpoint request that will be sent.</typeparam>
   /// <param name="req">Request to be sent.</param>
   /// <param name="endpointUriPrefix">Path to append as prefix to resolved enpoint uri. Usually used to add path segments to configured client's base address.</param>
   /// <param name="ct">The <see cref="CancellationToken"/> to cancel operation.</param>
@@ -70,13 +63,12 @@ Task<Result> SendAsync<TRequest>(
   /// <param name="uriResolverName"><see cref="IServiceEndpointUriResolver"/> name to be used to resolve ServiceEnpoint Uri.</param>
   /// <param name="serializerName"><see cref="IServiceChannelSerializer"/> name to be used to resolve ServiceEnpoint Uri.</param>
   /// <returns>Response of remote service endpoint or failure result.</returns>
-  Task<Result> SendAsync<TRequest>(
-    TRequest req,
+  Task<Result> SendAsync(
+    IServiceRequest req,
     string? endpointUriPrefix,
     CancellationToken ct,
     Func<IServiceProvider, HttpRequestMessage, CancellationToken, Task>? httpRequestInterceptor = null,
     Func<IServiceProvider, HttpResponseMessage, CancellationToken, Task>? httpResponseInterceptor = null,
     string? uriResolverName = null,
-    string? serializerName = null)
-    where TRequest : IServiceRequest;
+    string? serializerName = null);
 }

src/ModEndpoints.RemoteServices/ServiceChannelRegistry.cs

@@ -23,12 +23,6 @@ private ServiceChannelRegistry()
     _httpClientList = new();
   }
 
-  public bool IsRequestRegistered<TRequest>()
-    where TRequest : IServiceRequestMarker
-  {
-    return IsRequestRegistered(typeof(TRequest));
-  }
-
   public bool IsRequestRegistered(Type requestType)
   {
     return _registry.ContainsKey(requestType);
@@ -49,12 +43,6 @@ internal bool RegisterRequest(Type requestType, string clientName)
     return _registry.TryAdd(requestType, clientName);
   }
 
-  public bool IsRequestRegistered<TRequest>([NotNullWhen(true)] out string? clientName)
-    where TRequest : IServiceRequestMarker
-  {
-    return IsRequestRegistered(typeof(TRequest), out clientName);
-  }
-
   public bool IsRequestRegistered(Type requestType, [NotNullWhen(true)] out string? clientName)
   {
     return _registry.TryGetValue(requestType, out clientName);