Merge pull request #44 from MaryamTaheri/refactor/HCG-43

refactor/HCG-43

Author: amingolmahalle

examples/HttpClientToCurl.Sample.InString/ApiCaller.cs

@@ -4,42 +4,25 @@ namespace HttpClientToCurl.Sample.InString;
 
 public static class ApiCaller
 {
+    // Create an instance of HttpClient
+    private static readonly HttpClient Client = new();
+    private const string ApiUrl = "https://jsonplaceholder.typicode.com/posts";
+    private const string AccessToken = "YourAccessToken";
+
     public static async Task MakeApiCall()
     {
-        string apiUrl = "https://jsonplaceholder.typicode.com/posts";
-
-        // Create an instance of HttpClient
-        HttpClient client = new();
-
         try
         {
             // Create a sample JSON payload
-            string jsonPayload =
-                "{\"title\":\"New Post\",\"body\":\"This is the body of the new post\",\"userId\":1}";
-
-            // Create HttpRequestMessage with the POST verb
-            HttpRequestMessage request = new(HttpMethod.Post, apiUrl);
-
-            // Set up the request headers
-            request.Headers.Add("Authorization", "Bearer YourAccessToken"); // Add any necessary headers
-
-            // Set the request content with the JSON payload
-            request.Content = new StringContent(jsonPayload, Encoding.UTF8, "application/json");
+            var jsonPayload = "{\"title\":\"New Post\",\"body\":\"This is the body of the new post\",\"userId\":1}";
 
             // Generate a curl command as a string for debugging or testing.
-            // This string can be directly imported into Postman for checking and comparing against all the requirements.
-            string curlCommandString = client.GenerateCurlInString(request);
-
-            Console.WriteLine(curlCommandString);
-
-            // Send the request
-            HttpResponseMessage response = await client.SendAsync(request);
+            var response = await SendHttpRequest(HttpMethod.Post, ApiUrl, jsonPayload);
 
             // Check if the request was successful (status code 200-299)
             if (response.IsSuccessStatusCode)
             {
-                // Read and print the response content as a string
-                string responseBody = await response.Content.ReadAsStringAsync();
+                var responseBody = await response.Content.ReadAsStringAsync();
                 Console.WriteLine("Response from the API:\n" + responseBody);
             }
             else
@@ -52,4 +35,18 @@ public static async Task MakeApiCall()
             Console.WriteLine($"Exception: {ex.Message}");
         }
     }
+
+    private static async Task<HttpResponseMessage> SendHttpRequest(HttpMethod method, string url, string payload = null)
+    {
+        var request = new HttpRequestMessage(method, url);
+
+        request.Headers.Add("Authorization", $"Bearer {AccessToken}");
+        request.Content = new StringContent(payload, Encoding.UTF8, "application/json");
+
+        Console.WriteLine(GenerateCurl(request));
+
+        return await Client.SendAsync(request);
+    }
+
+    private static string GenerateCurl(HttpRequestMessage request) => Client.GenerateCurlInString(request);
 }

src/HttpClientToCurl/Builder/Concrete/Common/BaseBuilder.cs

@@ -1,8 +1,12 @@
 using System.Text;
+using HttpClientToCurl.Builder.Interface;
+using HttpClientToCurl.Config;
 
 namespace HttpClientToCurl.Builder.Concrete.Common;
 
-public abstract class BaseBuilder
+public abstract class BaseBuilder : IBuilder
 {
     protected readonly StringBuilder _stringBuilder = new();
+
+    public abstract string CreateCurl(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config);
 }

src/HttpClientToCurl/Builder/Concrete/HttpDeleteBuilder.cs

@@ -1,12 +1,11 @@
 using HttpClientToCurl.Builder.Concrete.Common;
 using HttpClientToCurl.Config;
-using HttpClientToCurl.Builder.Interface;
 
 namespace HttpClientToCurl.Builder.Concrete;
 
-public sealed class HttpDeleteBuilder : BaseBuilder, IBuilder
+public sealed class HttpDeleteBuilder : BaseBuilder
 {
-    public string Create(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
+    public override string CreateCurl(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
     {
         return _stringBuilder
             .Initialize(httpRequestMessage.Method)

src/HttpClientToCurl/Builder/Concrete/HttpGetBuilder.cs

@@ -1,12 +1,11 @@
 using HttpClientToCurl.Builder.Concrete.Common;
 using HttpClientToCurl.Config;
-using HttpClientToCurl.Builder.Interface;
 
 namespace HttpClientToCurl.Builder.Concrete;
 
-public sealed class HttpGetBuilder : BaseBuilder, IBuilder
+public sealed class HttpGetBuilder : BaseBuilder
 {
-    public string Create(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
+    public override string CreateCurl(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
     {
         return _stringBuilder
             .Initialize(httpRequestMessage.Method)

src/HttpClientToCurl/Builder/Concrete/HttpPatchBuilder.cs

@@ -1,12 +1,11 @@
 using HttpClientToCurl.Builder.Concrete.Common;
 using HttpClientToCurl.Config;
-using HttpClientToCurl.Builder.Interface;
 
 namespace HttpClientToCurl.Builder.Concrete;
 
-public sealed class HttpPatchBuilder : BaseBuilder, IBuilder
+public sealed class HttpPatchBuilder : BaseBuilder
 {
-    public string Create(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
+    public override string CreateCurl(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
     {
         return _stringBuilder
             .Initialize(httpRequestMessage.Method)

src/HttpClientToCurl/Builder/Concrete/HttpPostBuilder.cs

@@ -1,12 +1,11 @@
 using HttpClientToCurl.Builder.Concrete.Common;
 using HttpClientToCurl.Config;
-using HttpClientToCurl.Builder.Interface;
 
 namespace HttpClientToCurl.Builder.Concrete;
 
-public sealed class HttpPostBuilder : BaseBuilder, IBuilder
+public sealed class HttpPostBuilder : BaseBuilder
 {
-    public string Create(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
+    public override string CreateCurl(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
     {
         return _stringBuilder
             .Initialize(httpRequestMessage.Method)

src/HttpClientToCurl/Builder/Concrete/HttpPutBuilder.cs

@@ -1,12 +1,11 @@
 using HttpClientToCurl.Builder.Concrete.Common;
 using HttpClientToCurl.Config;
-using HttpClientToCurl.Builder.Interface;
 
 namespace HttpClientToCurl.Builder.Concrete;
 
-public sealed class HttpPutBuilder : BaseBuilder, IBuilder
+public sealed class HttpPutBuilder : BaseBuilder
 {
-    public string Create(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
+    public override string CreateCurl(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
     {
         return _stringBuilder
             .Initialize(httpRequestMessage.Method)

src/HttpClientToCurl/Builder/Director/Creator.cs

@@ -1,12 +1,12 @@
+using System.Text;
 using HttpClientToCurl.Config;
 using HttpClientToCurl.Builder.Interface;
 
 namespace HttpClientToCurl.Builder.Director;
 
-public class Creator(IBuilder builder)
+public abstract class BaseBuilder : IBuilder
 {
-    public string CreateCurl(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
-    {
-        return builder.Create(httpClient, httpRequestMessage, config);
-    }
+    protected readonly StringBuilder _stringBuilder = new();
+
+    public abstract string CreateCurl(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config);
 }

src/HttpClientToCurl/Builder/Generator.cs

@@ -1,6 +1,5 @@
-using System.Data;
 using HttpClientToCurl.Builder.Concrete;
-using HttpClientToCurl.Builder.Director;
+using HttpClientToCurl.Builder.Interface;
 using HttpClientToCurl.Config;
 
 namespace HttpClientToCurl.Builder;
@@ -9,45 +8,21 @@ public static class Generator
 {
     public static string GenerateCurl(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
     {
-        string script;
+        var builder = GetBuilder(httpRequestMessage.Method);
+        return builder.CreateCurl(httpClient, httpRequestMessage, config);
+    }
 
-        try
-        {
-            if (httpRequestMessage.Method == HttpMethod.Get)
-            {
-                var instance = new Creator(new HttpGetBuilder());
-                script = instance.CreateCurl(httpClient, httpRequestMessage, config);
-            }
-            else if (httpRequestMessage.Method == HttpMethod.Post)
-            {
-                var instance = new Creator(new HttpPostBuilder());
-                script = instance.CreateCurl(httpClient, httpRequestMessage, config);
-            }
-            else if (httpRequestMessage.Method == HttpMethod.Put)
-            {
-                var instance = new Creator(new HttpPutBuilder());
-                script = instance.CreateCurl(httpClient, httpRequestMessage, config);
-            }
-            else if (httpRequestMessage.Method == HttpMethod.Patch)
-            {
-                var instance = new Creator(new HttpPatchBuilder());
-                script = instance.CreateCurl(httpClient, httpRequestMessage, config);
-            }
-            else if (httpRequestMessage.Method == HttpMethod.Delete)
-            {
-                var instance = new Creator(new HttpDeleteBuilder());
-                script = instance.CreateCurl(httpClient, httpRequestMessage, config);
-            }
-            else
-            {
-                throw new DataException($"not supported {httpRequestMessage.Method.Method} by HttpClientToCurl!");
-            }
-        }
-        catch (Exception exception)
+    private static IBuilder GetBuilder(HttpMethod method)
+    {
+        string methodName = method.Method;
+        return methodName switch
         {
-            script = $"GenerateCurlError => {exception.Message} {exception.InnerException}";
-        }
-
-        return script;
+            "GET" => new HttpGetBuilder(),
+            "POST" => new HttpPostBuilder(),
+            "PUT" => new HttpPutBuilder(),
+            "PATCH" => new HttpPatchBuilder(),
+            "DELETE" => new HttpDeleteBuilder(),
+            _ => throw new NotSupportedException($"HTTP method {method} is not supported."),
+        };
     }
 }

src/HttpClientToCurl/Builder/Interface/IBuilder.cs

@@ -4,5 +4,5 @@ namespace HttpClientToCurl.Builder.Interface;
 
 public interface IBuilder
 {
-    string Create(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config);
+    string CreateCurl(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config);
 }