Merge pull request #52 from mozhganEtaati/mozhganEtaati/refactor/HCG-51

Closed: #51

Author: naeemaei

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

@@ -84,8 +84,6 @@ private static string GetAbsoluteAddress(Uri baseAddressUri, bool baseAddressIsA
 
     private static string ApplyEncodeUri(this string address)
     {
-        string result = null;
-
         if (address is not null)
         {
             var questionMarkItems = address.Split('?');
@@ -110,14 +108,14 @@ private static string ApplyEncodeUri(this string address)
                         }
                     }
 
-                    result = addressEncodedStringBuilder
+                    return addressEncodedStringBuilder
                         .Remove(addressEncodedStringBuilder.Length - 1, 1)
                         .ToString();
                 }
             }
         }
 
-        return result;
+        return null;
     }
 
     internal static StringBuilder AddHeaders(this StringBuilder stringBuilder, HttpClient httpClient,

src/HttpClientToCurl/Utility/Helpers.cs

@@ -115,41 +115,29 @@ internal static HttpRequestMessage FillHttpRequestMessage(HttpMethod httpMethod,
 
     internal static HttpRequestMessage FillHttpRequestMessage(HttpMethod httpMethod, HttpRequestHeaders requestHeaders, HttpContent requestBody, string requestUri)
     {
-        var httpRequestMessage = FillHttpRequestMessage(httpMethod, requestHeaders, requestBody, CreateUri(requestUri));
-
-        return httpRequestMessage;
+        return FillHttpRequestMessage(httpMethod, requestHeaders, requestBody, CreateUri(requestUri));
     }
 
     internal static bool CheckAddressIsAbsoluteUri(Uri baseAddress)
     {
-        bool isValidAbsoluteAddress = true;
-
-        if (baseAddress is null)
-        {
-            isValidAbsoluteAddress = false;
-        }
-        else if (!baseAddress.IsAbsoluteUri)
-        {
-            isValidAbsoluteAddress = false;
-        }
-        else if (!IsHttpUri(baseAddress))
+        if (baseAddress is null || !baseAddress.IsAbsoluteUri || !IsHttpUri(baseAddress))
         {
-            isValidAbsoluteAddress = false;
+            return false;
         }
 
-        return isValidAbsoluteAddress;
+        return true;
     }
 
     private static bool IsHttpUri(Uri uri)
     {
         string scheme = uri.Scheme;
 
-        return (string.Compare("http", scheme, StringComparison.OrdinalIgnoreCase) == 0) ||
-               (string.Compare("https", scheme, StringComparison.OrdinalIgnoreCase) == 0);
+        return string.Equals("http", scheme, StringComparison.OrdinalIgnoreCase) ||
+               string.Equals("https", scheme, StringComparison.OrdinalIgnoreCase);
     }
 
     public static Uri CreateUri(string uri)
     {
-        return string.IsNullOrEmpty(uri) ? null : new Uri(uri, UriKind.RelativeOrAbsolute);
+        return string.IsNullOrWhiteSpace(uri) ? null : new Uri(uri, UriKind.RelativeOrAbsolute);
     }
 }