From 4092ac467d05740c2798093cc892e7eac9a58f38 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Mon, 18 Oct 2021 19:19:51 +0800 Subject: [PATCH] style: clean code --- .../WechatAdsClientExecuteAdCreativesExtensions.cs | 8 ++++---- .../WechatAdsClientExecuteAdGroupsExtensions.cs | 8 ++++---- .../WechatAdsClientExecuteAdsExtensions.cs | 8 ++++---- .../WechatAdsClientExecuteAsyncTasksExtensions.cs | 4 ++-- .../WechatAdsClientExecuteCampaignsExtensions.cs | 8 ++++---- .../WechatAdsClientExecuteCreditBillsExtensions.cs | 4 ++-- ...hatAdsClientExecuteCustomAudiencesExtensions.cs | 14 +++++++------- .../WechatAdsClientExecuteFundsExtensions.cs | 6 +++--- .../WechatAdsClientExecuteImagesExtensions.cs | 14 +++++++------- .../WechatAdsClientExecuteReportsExtensions.cs | 8 ++++---- .../WechatAdsClient.cs | 4 ++-- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdCreativesExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdCreativesExtensions.cs index 6a7874df..015c6447 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdCreativesExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdCreativesExtensions.cs @@ -66,16 +66,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads .CreateRequest(request, HttpMethod.Get, "adcreatives", "get") .SetQueryParam("access_token", request.AccessToken); - if (request.AdCreativeId.HasValue) + if (request.AdCreativeId != null) flurlReq.SetQueryParam("adcreative_id", request.AdCreativeId.Value); - if (request.Filters != null && request.Filters.Any()) + if (request.Filters != null) flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters)); - if (request.PageSize.HasValue) + if (request.PageSize != null) flurlReq.SetQueryParam("page_size", request.PageSize.Value); - if (request.Page.HasValue) + if (request.Page != null) flurlReq.SetQueryParam("page", request.Page.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdGroupsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdGroupsExtensions.cs index fd886f8e..afd3e72f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdGroupsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdGroupsExtensions.cs @@ -66,16 +66,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads .CreateRequest(request, HttpMethod.Get, "adgroups", "get") .SetQueryParam("access_token", request.AccessToken); - if (request.AdGroupId.HasValue) + if (request.AdGroupId != null) flurlReq.SetQueryParam("adgroup_id", request.AdGroupId.Value); - if (request.Filters != null && request.Filters.Any()) + if (request.Filters != null) flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters)); - if (request.PageSize.HasValue) + if (request.PageSize != null) flurlReq.SetQueryParam("page_size", request.PageSize.Value); - if (request.Page.HasValue) + if (request.Page != null) flurlReq.SetQueryParam("page", request.Page.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdsExtensions.cs index ad41e7f9..e3d3b721 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdsExtensions.cs @@ -66,16 +66,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads .CreateRequest(request, HttpMethod.Get, "ads", "get") .SetQueryParam("access_token", request.AccessToken); - if (request.AdId.HasValue) + if (request.AdId != null) flurlReq.SetQueryParam("ad_id", request.AdId.Value); - if (request.Filters != null && request.Filters.Any()) + if (request.Filters != null) flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters)); - if (request.PageSize.HasValue) + if (request.PageSize != null) flurlReq.SetQueryParam("page_size", request.PageSize.Value); - if (request.Page.HasValue) + if (request.Page != null) flurlReq.SetQueryParam("page", request.Page.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAsyncTasksExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAsyncTasksExtensions.cs index eae0a526..8a3adba5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAsyncTasksExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAsyncTasksExtensions.cs @@ -50,10 +50,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads if (request.Filters != null && request.Filters.Any()) flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters)); - if (request.PageSize.HasValue) + if (request.PageSize != null) flurlReq.SetQueryParam("page_size", request.PageSize.Value); - if (request.Page.HasValue) + if (request.Page != null) flurlReq.SetQueryParam("page", request.Page.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCampaignsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCampaignsExtensions.cs index a288cd82..ae64f815 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCampaignsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCampaignsExtensions.cs @@ -66,16 +66,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads .CreateRequest(request, HttpMethod.Get, "campaigns", "get") .SetQueryParam("access_token", request.AccessToken); - if (request.CampaignId.HasValue) + if (request.CampaignId != null) flurlReq.SetQueryParam("campaign_id", request.CampaignId.Value); - if (request.Filters != null && request.Filters.Any()) + if (request.Filters != null) flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters)); - if (request.PageSize.HasValue) + if (request.PageSize != null) flurlReq.SetQueryParam("page_size", request.PageSize.Value); - if (request.Page.HasValue) + if (request.Page != null) flurlReq.SetQueryParam("page", request.Page.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCreditBillsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCreditBillsExtensions.cs index 32ee1391..4ab7bb22 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCreditBillsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCreditBillsExtensions.cs @@ -29,10 +29,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads .SetQueryParam("bill_year", request.BillYear) .SetQueryParam("bill_month", request.BillMonth); - if (request.PageSize.HasValue) + if (request.PageSize != null) flurlReq.SetQueryParam("page_size", request.PageSize.Value); - if (request.Page.HasValue) + if (request.Page != null) flurlReq.SetQueryParam("page", request.Page.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCustomAudiencesExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCustomAudiencesExtensions.cs index 7a32a76d..dc7b5211 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCustomAudiencesExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCustomAudiencesExtensions.cs @@ -67,13 +67,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads .CreateRequest(request, HttpMethod.Get, "custom_audiences", "get") .SetQueryParam("access_token", request.AccessToken); - if (request.CustomAudienceId.HasValue) + if (request.CustomAudienceId != null) flurlReq.SetQueryParam("audience_id", request.CustomAudienceId.Value); - if (request.PageSize.HasValue) + if (request.PageSize != null) flurlReq.SetQueryParam("page_size", request.PageSize.Value); - if (request.Page.HasValue) + if (request.Page != null) flurlReq.SetQueryParam("page", request.Page.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -126,16 +126,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads .CreateRequest(request, HttpMethod.Get, "custom_audience_files", "get") .SetQueryParam("access_token", request.AccessToken); - if (request.CustomAudienceId.HasValue) + if (request.CustomAudienceId != null) flurlReq.SetQueryParam("audience_id", request.CustomAudienceId.Value); - if (request.CustomAudienceFileId.HasValue) + if (request.CustomAudienceFileId != null) flurlReq.SetQueryParam("custom_audience_file_id", request.CustomAudienceFileId.Value); - if (request.PageSize.HasValue) + if (request.PageSize != null) flurlReq.SetQueryParam("page_size", request.PageSize.Value); - if (request.Page.HasValue) + if (request.Page != null) flurlReq.SetQueryParam("page", request.Page.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteFundsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteFundsExtensions.cs index 6f19f6e1..5aca6615 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteFundsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteFundsExtensions.cs @@ -68,13 +68,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads if (request.DateRange != null) flurlReq.SetQueryParam("date_range", client.JsonSerializer.Serialize(request.DateRange)); - if (!string.IsNullOrEmpty(request.TradeType)) + if (request.TradeType != null) flurlReq.SetQueryParam("trade_type", request.TradeType); - if (request.PageSize.HasValue) + if (request.PageSize != null) flurlReq.SetQueryParam("page_size", request.PageSize.Value); - if (request.Page.HasValue) + if (request.Page != null) flurlReq.SetQueryParam("page", request.Page.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteImagesExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteImagesExtensions.cs index b4ecb6f5..e773659d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteImagesExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteImagesExtensions.cs @@ -26,17 +26,17 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads if (client is null) throw new ArgumentNullException(nameof(client)); if (request is null) throw new ArgumentNullException(nameof(request)); - if (string.IsNullOrEmpty(request.FileName)) + if (request.FileName == null) { request.FileName = Guid.NewGuid().ToString("N").ToLower(); } - if (string.IsNullOrEmpty(request.FileContentType)) + if (request.FileContentType == null) { request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "image/png"; } - if (string.IsNullOrEmpty(request.FileHash)) + if (request.FileHash == null) { request.FileHash = Security.MD5Utility.Hash(request.FileBytes ?? new byte[0]); } @@ -71,16 +71,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads .CreateRequest(request, HttpMethod.Get, "images", "get") .SetQueryParam("access_token", request.AccessToken); - if (!string.IsNullOrEmpty(request.ImageId)) + if (request.ImageId != null) flurlReq.SetQueryParam("image_id", request.ImageId); - if (request.Filters != null && request.Filters.Any()) + if (request.Filters != null) flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters)); - if (request.PageSize.HasValue) + if (request.PageSize != null) flurlReq.SetQueryParam("page_size", request.PageSize.Value); - if (request.Page.HasValue) + if (request.Page != null) flurlReq.SetQueryParam("page", request.Page.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteReportsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteReportsExtensions.cs index 38580328..5529865f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteReportsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteReportsExtensions.cs @@ -31,16 +31,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads if (request.DateRange != null) flurlReq.SetQueryParam("date_range", client.JsonSerializer.Serialize(request.DateRange)); - if (!string.IsNullOrEmpty(request.ReportType)) + if (request.ReportType != null) flurlReq.SetQueryParam("report_type", request.ReportType); - if (!string.IsNullOrEmpty(request.ReportLevel)) + if (request.ReportLevel != null) flurlReq.SetQueryParam("level", request.ReportLevel); - if (request.PageSize.HasValue) + if (request.PageSize != null) flurlReq.SetQueryParam("page_size", request.PageSize.Value); - if (request.Page.HasValue) + if (request.Page != null) flurlReq.SetQueryParam("page", request.Page.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs index 730072cf..1db59616 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/WechatAdsClient.cs @@ -64,12 +64,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads { IFlurlRequest flurlRequest = FlurlClient.Request(urlSegments).WithVerb(method); - if (request.Timeout.HasValue) + if (request.Timeout != null) { flurlRequest.WithTimeout(TimeSpan.FromMilliseconds(request.Timeout.Value)); } - if (!string.IsNullOrEmpty(request.Version)) + if (request.Version != null) { flurlRequest.SetQueryParam("version", request.Version); }