Refactor ClientBuilder

Author: RafaelEstevamReis

Simple.API/ClientBuilder.cs

@@ -12,42 +12,39 @@ namespace Simple.API;
 public class ClientBuilder : DispatchProxy
 {
     static readonly Type TypeOfTask = typeof(Task);
-    static readonly Type TypeOfClientInfo = typeof(ClientInfo);
-    static readonly Type TypeOfResponseExtensions = typeof(ResponseExtensions);
 
-    static readonly MethodInfo[] MethodsOfClientInfo = TypeOfClientInfo.GetMethods();
+    static readonly MethodInfo[] MethodsOfClientInfo = typeof(ClientInfo).GetMethods();
     static readonly MethodInfo MethodGetAsync = MethodsOfClientInfo.Where(o => o.Name == nameof(ClientInfo.GetAsync)).First();
     static readonly MethodInfo MethodPostAsync = MethodsOfClientInfo.Where(o => o.Name == nameof(ClientInfo.PostAsync)).First();
     static readonly MethodInfo MethodPutAsync = MethodsOfClientInfo.Where(o => o.Name == nameof(ClientInfo.PutAsync)).First();
 
+    static readonly Type TypeOfResponseExtensions = typeof(ResponseExtensions);
     static readonly MethodInfo MethodGetSuccessfulDataTask = TypeOfResponseExtensions
         .GetMethods()
         .Where(o => o.Name == nameof(ResponseExtensions.GetSuccessfulData)
                     && o.ReturnType.BaseType.Name == "Task")
         .First(); // Exception if not found
 
-
-
-
     internal ClientInfo client;
-    public ClientBuilder()
-    {
-    }
 
     public static T Create<T>(string uri, HttpMessageHandler clientHandler = null)
         where T : class
     {
-        var proxy = Create<T, ClientBuilder>();
+        // Base ClientInfo
         var client = new ClientInfo(uri, clientHandler);
-        (proxy as ClientBuilder).client = client;
 
+        // Process Interface Attributes
         var typeT = typeof(T);
         var timeoutAttr = typeT.GetCustomAttribute<TimeoutAttribute>();
         if (timeoutAttr != null)
         {
             client.Timeout = timeoutAttr.Timeout;
         }
 
+        // Create proxy
+        var proxy = DispatchProxy.Create<T, ClientBuilder>();
+        (proxy as ClientBuilder).client = client;
+
         return proxy;
     }
 
@@ -68,8 +65,8 @@ protected override object Invoke(MethodInfo targetMethod, object[] args)
 
         // Check InRoute
         var methodParams = targetMethod.GetParameters();
-        var inRoutes = methodParams.Select(o => o.GetCustomAttribute<InRouteAttribute>()).ToArray();
-        var hasAnyInRoutes = inRoutes.Any(o => o != null);
+        var inRoutesParams = methodParams.Select(o => o.GetCustomAttribute<InRouteAttribute>()).ToArray();
+        var hasAnyInRoutes = inRoutesParams.Any(o => o != null);
         var hasRouteParam = httpMethod.Route.Contains('{');
         if (hasAnyInRoutes && !hasRouteParam) throw new InvalidOperationException($"Attribute {nameof(InRouteAttribute)} must be used in a route with parameters");
         if (!hasAnyInRoutes && hasRouteParam) throw new InvalidOperationException($"Route parameters must be used with {nameof(InRouteAttribute)}");
@@ -94,37 +91,11 @@ protected override object Invoke(MethodInfo targetMethod, object[] args)
             usesResponseReturn = true;
         }
 
-        /* Extract Route information */
+        /* Extract Route parameters */
         string route = httpMethod.Route;
         if (hasRouteParam)
         {
-            Dictionary<string, string> dicParams = [];
-            // Parse route params
-            for (int i = 0; i < inRoutes.Length; i++)
-            {
-                if (inRoutes[i] == null) continue;
-
-                // Get 'Key' in [inRoutes] and 'value' in [args]
-                var name = methodParams[i].Name;
-                var value = args[i];
-
-                dicParams[name] = value?.ToString() ?? "";
-            }
-
-            // Replace route
-            foreach (var pair in dicParams)
-            {
-                string key = $"{{{pair.Key}}}";
-                route = route.Replace(key, pair.Value);
-            }
-
-            // rebuild args
-            List<object> lstParams = new List<object>(args);
-            for (int i = lstParams.Count - 1; i >= 0; i--)
-            {
-                if (inRoutes[i] != null) lstParams.RemoveAt(i);
-            }
-            args = lstParams.ToArray();
+            processInRouteArguments(methodParams, inRoutesParams, ref route, ref args);
         }
 
         /* Method Selection */
@@ -142,6 +113,37 @@ protected override object Invoke(MethodInfo targetMethod, object[] args)
         return task;
     }
 
+    private static void processInRouteArguments(ParameterInfo[] methodParams, InRouteAttribute[] inRoutes, ref string route, ref object[] args)
+    {
+        Dictionary<string, string> dicParams = [];
+        // Parse route params
+        for (int i = 0; i < inRoutes.Length; i++)
+        {
+            if (inRoutes[i] == null) continue;
+
+            // Get 'Key' in [inRoutes] and 'value' in [args]
+            var name = methodParams[i].Name;
+            var value = args[i];
+
+            dicParams[name] = value?.ToString() ?? "";
+        }
+
+        // Replace route
+        foreach (var pair in dicParams)
+        {
+            string key = $"{{{pair.Key}}}";
+            route = route.Replace(key, pair.Value);
+        }
+
+        // rebuild args
+        List<object> lstParams = new List<object>(args);
+        for (int i = lstParams.Count - 1; i >= 0; i--)
+        {
+            if (inRoutes[i] != null) lstParams.RemoveAt(i);
+        }
+        args = lstParams.ToArray();
+    }
+
     private static void selectMethodToExecute(string route, object[] args, MethodAttribute httpMethod, Type innerType, out MethodInfo methodToCall, out object[] methodArgs)
     {
         if (httpMethod is GetAttribute)

Simple.Test/Program.cs

@@ -3,6 +3,6 @@
 Console.WriteLine("Choose an Example");
 
 //await Simple.Test.Example_ClientInfo.Run();
-//await Simple.Test.Example_ClientBuilder.Run();
+await Simple.Test.Example_ClientBuilder.Run();
 //await Simple.Test.Example_WebSocket.Run_String();
 //await Simple.Test.Example_WebSocket.Run_Json();