Skip to content

Commit 519f5e4

Browse files
aminamin
amin
authored and
amin
committed
code refactoring
1 parent 2d1f6f4 commit 519f5e4

File tree

13 files changed

+56
-159
lines changed

13 files changed

+56
-159
lines changed

‎src/HttpClientToCurl/Builder/Concrete/HttpDeleteBuilder.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using HttpClientToCurl.Builder.Concrete.Common;
22
using HttpClientToCurl.Config;
3+
using HttpClientToCurl.Builder.Interface;
34

45
namespace HttpClientToCurl.Builder.Concrete;
56

6-
public sealed class HttpDeleteBuilder : BaseBuilder, Interface.IBuilder
7+
public sealed class HttpDeleteBuilder : BaseBuilder, IBuilder
78
{
89
public string Create(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
910
{

‎src/HttpClientToCurl/Builder/Concrete/HttpGetBuilder.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using HttpClientToCurl.Builder.Concrete.Common;
22
using HttpClientToCurl.Config;
3+
using HttpClientToCurl.Builder.Interface;
34

45
namespace HttpClientToCurl.Builder.Concrete;
56

6-
public sealed class HttpGetBuilder : BaseBuilder, Interface.IBuilder
7+
public sealed class HttpGetBuilder : BaseBuilder, IBuilder
78
{
89
public string Create(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
910
{

‎src/HttpClientToCurl/Builder/Concrete/HttpPatchBuilder.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using HttpClientToCurl.Builder.Concrete.Common;
22
using HttpClientToCurl.Config;
3+
using HttpClientToCurl.Builder.Interface;
34

45
namespace HttpClientToCurl.Builder.Concrete;
56

6-
public sealed class HttpPatchBuilder : BaseBuilder, Interface.IBuilder
7+
public sealed class HttpPatchBuilder : BaseBuilder, IBuilder
78
{
89
public string Create(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
910
{

‎src/HttpClientToCurl/Builder/Concrete/HttpPostBuilder.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using HttpClientToCurl.Builder.Concrete.Common;
22
using HttpClientToCurl.Config;
3+
using HttpClientToCurl.Builder.Interface;
34

45
namespace HttpClientToCurl.Builder.Concrete;
56

6-
public sealed class HttpPostBuilder : BaseBuilder, Interface.IBuilder
7+
public sealed class HttpPostBuilder : BaseBuilder, IBuilder
78
{
89
public string Create(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
910
{

‎src/HttpClientToCurl/Builder/Concrete/HttpPutBuilder.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using HttpClientToCurl.Builder.Concrete.Common;
22
using HttpClientToCurl.Config;
3+
using HttpClientToCurl.Builder.Interface;
34

45
namespace HttpClientToCurl.Builder.Concrete;
56

6-
public sealed class HttpPutBuilder : BaseBuilder, Interface.IBuilder
7+
public sealed class HttpPutBuilder : BaseBuilder, IBuilder
78
{
89
public string Create(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
910
{

‎src/HttpClientToCurl/Builder/Director/Creator.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
using HttpClientToCurl.Config;
2+
using HttpClientToCurl.Builder.Interface;
23

34
namespace HttpClientToCurl.Builder.Director;
45

5-
public class Creator(Interface.IBuilder builder)
6+
public class Creator(IBuilder builder)
67
{
78
public string CreateCurl(HttpClient httpClient, HttpRequestMessage httpRequestMessage, BaseConfig config)
89
{

‎src/HttpClientToCurl/Config/BaseConfig.cs‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,7 @@ namespace HttpClientToCurl.Config;
22

33
public class BaseConfig
44
{
5-
public BaseConfig()
6-
{
7-
TurnOn = true;
8-
NeedAddDefaultHeaders = true;
9-
EnableCompression = false;
10-
}
11-
12-
public bool TurnOn { get; set; }
13-
public bool NeedAddDefaultHeaders { get; set; }
14-
public bool EnableCompression { get; set; }
5+
public bool TurnOn { get; set; } = true;
6+
public bool NeedAddDefaultHeaders { get; set; } = true;
7+
public bool EnableCompression { get; set; } = false;
158
}

‎src/HttpClientToCurl/Config/StringConfig.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
namespace HttpClientToCurl.Config;
22

3-
public sealed class StringConfig : BaseConfig
4-
{
5-
}
3+
public sealed class StringConfig : BaseConfig;

‎src/HttpClientToCurl/Utility/Helpers.cs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,11 @@ private static string NormalizedPath(string path)
8585
}
8686

8787
private static string NormalizedFilename(string filename)
88-
=> string.IsNullOrWhiteSpace(filename)
88+
{
89+
return string.IsNullOrWhiteSpace(filename)
8990
? DateTime.Now.Date.ToString("yyyyMMdd")
9091
: filename.Trim();
92+
}
9193

9294
internal static HttpRequestMessage FillHttpRequestMessage(HttpMethod httpMethod, HttpRequestHeaders requestHeaders, HttpContent requestBody, Uri requestUri)
9395
{
@@ -147,5 +149,7 @@ private static bool IsHttpUri(Uri uri)
147149
}
148150

149151
public static Uri CreateUri(string uri)
150-
=> string.IsNullOrEmpty(uri) ? null : new Uri(uri, UriKind.RelativeOrAbsolute);
152+
{
153+
return string.IsNullOrEmpty(uri) ? null : new Uri(uri, UriKind.RelativeOrAbsolute);
154+
}
151155
}

‎tests/HttpClientToCurlGeneratorTest/FunctionalTest/SuccessScenariosTests.cs‎

Lines changed: 15 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ public void Success_GenerateCurlInString_For_PostMethod()
2121
string requestBody = /*lang=json,strict*/ @"{""name"":""sara"",""requestId"":10001001,""amount"":20000}";
2222

2323
var requestUri = "api/test";
24-
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri)
25-
{
26-
Content = new StringContent(requestBody, Encoding.UTF8, MediaTypeNames.Application.Json)
27-
};
24+
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri) { Content = new StringContent(requestBody, Encoding.UTF8, MediaTypeNames.Application.Json) };
2825
httpRequestMessage.Headers.Add("Authorization", "Bearer 4797c126-3f8a-454a-aff1-96c0220dae61");
2926

3027
using var httpClient = new HttpClient();
@@ -48,10 +45,7 @@ public void Success_GenerateCurlInString_With_RequestUri_TypeOf_Uri_For_PostMeth
4845
string requestBody = /*lang=json,strict*/ @"{""name"":""sara"",""requestId"":10001001,""amount"":20000}";
4946

5047
var requestUri = Helpers.CreateUri("api/test");
51-
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri)
52-
{
53-
Content = new StringContent(requestBody, Encoding.UTF8, MediaTypeNames.Application.Json)
54-
};
48+
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri) { Content = new StringContent(requestBody, Encoding.UTF8, MediaTypeNames.Application.Json) };
5549
httpRequestMessage.Headers.Add("Authorization", "Bearer 4797c126-3f8a-454a-aff1-96c0220dae61");
5650

5751
using var httpClient = new HttpClient();
@@ -74,10 +68,7 @@ public void GenerateCurl_When_Set_RequestUri_Inside_HttpRequestMessage_For_PostM
7468
// Arrange
7569
string requestBody = /*lang=json,strict*/ @"{""name"":""sara"",""requestId"":10001001,""amount"":20000}";
7670

77-
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, "api/test")
78-
{
79-
Content = new StringContent(requestBody, Encoding.UTF8, MediaTypeNames.Application.Json)
80-
};
71+
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, "api/test") { Content = new StringContent(requestBody, Encoding.UTF8, MediaTypeNames.Application.Json) };
8172
httpRequestMessage.Headers.Add("Authorization", "Bearer 4797c126-3f8a-454a-aff1-96c0220dae61");
8273

8374
using var httpClient = new HttpClient();
@@ -100,10 +91,7 @@ public void Success_GenerateCurlInString_When_RequestUri_Is_Null_For_PostMethod(
10091
// Arrange
10192
string requestBody = /*lang=json,strict*/ @"{""name"":""sara"",""requestId"":10001001,""amount"":20000}";
10293

103-
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, string.Empty)
104-
{
105-
Content = new StringContent(requestBody, Encoding.UTF8, MediaTypeNames.Application.Json)
106-
};
94+
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, string.Empty) { Content = new StringContent(requestBody, Encoding.UTF8, MediaTypeNames.Application.Json) };
10795
httpRequestMessage.Headers.Add("Authorization", "Bearer 4797c126-3f8a-454a-aff1-96c0220dae61");
10896

10997
using var httpClient = new HttpClient();
@@ -125,10 +113,7 @@ public void Success_GenerateCurlInString_When_RequestBody_Is_Null_For_PostMethod
125113
{
126114
// Arrange
127115
var requestUri = "api/test";
128-
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri)
129-
{
130-
Content = new StringContent(string.Empty, Encoding.UTF8, MediaTypeNames.Application.Json)
131-
};
116+
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri) { Content = new StringContent(string.Empty, Encoding.UTF8, MediaTypeNames.Application.Json) };
132117
httpRequestMessage.Headers.Add("Authorization", "Bearer 4797c126-3f8a-454a-aff1-96c0220dae61");
133118

134119
using var httpClient = new HttpClient();
@@ -169,12 +154,7 @@ public void Success_GenerateCurlInString_When_HttpContent_Is_Null_For_PostMethod
169154
public void Success_GenerateCurlInString_Without_HttpRequestMessage_For_PostMethod()
170155
{
171156
// Arrange
172-
var requestObject = new
173-
{
174-
name = "sara",
175-
requestId = 10001001,
176-
amount = 20000,
177-
};
157+
var requestObject = new { name = "sara", requestId = 10001001, amount = 20000, };
178158

179159
JsonContent jsonContent = JsonContent.Create(requestObject);
180160

@@ -201,12 +181,7 @@ public void Success_GenerateCurlInString_Without_HttpRequestMessage_For_PostMeth
201181
public void Success_GenerateCurlInString_Without_HttpRequestMessage_With_RequestUri_Typeof_Uri_For_PostMethod()
202182
{
203183
// Arrange
204-
var requestObject = new
205-
{
206-
name = "sara",
207-
requestId = 10001001,
208-
amount = 20000,
209-
};
184+
var requestObject = new { name = "sara", requestId = 10001001, amount = 20000, };
210185

211186
JsonContent jsonContent = JsonContent.Create(requestObject);
212187

@@ -254,12 +229,7 @@ public void Success_GenerateCurlInString_Without_HttpRequestMessage_And_Body_Is_
254229
public void Success_GenerateCurlInString_Without_HttpRequestMessage_And_RequestUri_Is_Null_For_PostMethod()
255230
{
256231
// Arrange
257-
var requestObject = new
258-
{
259-
name = "sara",
260-
requestId = 10001001,
261-
amount = 20000,
262-
};
232+
var requestObject = new { name = "sara", requestId = 10001001, amount = 20000, };
263233

264234
JsonContent jsonContent = JsonContent.Create(requestObject);
265235

@@ -285,12 +255,7 @@ public void Success_GenerateCurlInString_Without_HttpRequestMessage_And_RequestU
285255
public void Success_GenerateCurlInString_Without_HttpRequestMessage_And_HttpRequestHeader_Is_null_For_PostMethod()
286256
{
287257
// Arrange
288-
var requestObject = new
289-
{
290-
name = "sara",
291-
requestId = 10001001,
292-
amount = 20000,
293-
};
258+
var requestObject = new { name = "sara", requestId = 10001001, amount = 20000, };
294259

295260
JsonContent jsonContent = JsonContent.Create(requestObject);
296261

@@ -318,10 +283,7 @@ public void Success_GenerateCurlInString_With_Multiple_Value_For_A_Header_PostMe
318283
string requestBody = /*lang=json,strict*/ @"{""name"":""sara"",""requestId"":10001001,""amount"":20000}";
319284

320285
var requestUri = "api/test";
321-
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri)
322-
{
323-
Content = new StringContent(requestBody, Encoding.UTF8, MediaTypeNames.Application.Json)
324-
};
286+
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, requestUri) { Content = new StringContent(requestBody, Encoding.UTF8, MediaTypeNames.Application.Json) };
325287
httpRequestMessage.Headers.Add("Authorization", "Bearer 4797c126-3f8a-454a-aff1-96c0220dae61");
326288

327289
List<string?> headerValues = ["_ga=GA1.1.41226618.1701506283", "mywebsite-sp=cbf42587-7ec5-4179-aac5-cbc9ae6fbf05", "sp_ses.13cb=*"];
@@ -350,10 +312,7 @@ public void Success_GenerateCurlInString_For_GetMethod()
350312
{
351313
// Arrange
352314
var requestUri = "api/test";
353-
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri)
354-
{
355-
Content = new StringContent(string.Empty, Encoding.UTF8, MediaTypeNames.Application.Json)
356-
};
315+
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri) { Content = new StringContent(string.Empty, Encoding.UTF8, MediaTypeNames.Application.Json) };
357316
httpRequestMessage.Headers.Add("Authorization", "Bearer 703438f3-16ad-4ba5-b923-8f72cd0f2db9");
358317

359318
using var httpClient = new HttpClient();
@@ -374,15 +333,9 @@ public void Success_GenerateCurlInString_For_GetMethod()
374333
public void Success_GenerateCurlInString_With_QueryString_For_GetMethod()
375334
{
376335
// Arrange
377-
var queryString = new Dictionary<string, string>
378-
{
379-
{ "id", "12" }
380-
};
336+
var queryString = new Dictionary<string, string> { { "id", "12" } };
381337
var requestUri = QueryHelpers.AddQueryString("api/test", queryString!);
382-
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri)
383-
{
384-
Content = new StringContent(string.Empty, Encoding.UTF8, MediaTypeNames.Application.Json)
385-
};
338+
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri) { Content = new StringContent(string.Empty, Encoding.UTF8, MediaTypeNames.Application.Json) };
386339
httpRequestMessage.Headers.Add("Authorization", "Bearer 703438f3-16ad-4ba5-b923-8f72cd0f2db9");
387340

388341
using var httpClient = new HttpClient();
@@ -403,10 +356,7 @@ public void Success_GenerateCurlInString_With_QueryString_For_GetMethod()
403356
public void Success_GenerateCurlInString_When_RequestUri_Is_Null_For_GetMethod()
404357
{
405358
// Arrange
406-
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, string.Empty)
407-
{
408-
Content = new StringContent(string.Empty, Encoding.UTF8, MediaTypeNames.Application.Json)
409-
};
359+
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, string.Empty) { Content = new StringContent(string.Empty, Encoding.UTF8, MediaTypeNames.Application.Json) };
410360
httpRequestMessage.Headers.Add("Authorization", "Bearer 703438f3-16ad-4ba5-b923-8f72cd0f2db9");
411361

412362
using var httpClient = new HttpClient();
@@ -487,10 +437,7 @@ public void Success_GenerateCurlInString_With_Multiple_Value_For_A_Header_GetMet
487437
{
488438
// Arrange
489439
var requestUri = "api/test";
490-
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri)
491-
{
492-
Content = new StringContent(string.Empty, Encoding.UTF8, MediaTypeNames.Application.Json)
493-
};
440+
var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, requestUri) { Content = new StringContent(string.Empty, Encoding.UTF8, MediaTypeNames.Application.Json) };
494441
httpRequestMessage.Headers.Add("Authorization", "Bearer 703438f3-16ad-4ba5-b923-8f72cd0f2db9");
495442

496443
List<string?> headerValues = ["_ga=GA1.1.41226618.1701506283", "mywebsite-sp=cbf42587-7ec5-4179-aac5-cbc9ae6fbf05", "sp_ses.13cb=*"];

0 commit comments

Comments
 (0)