From 713783f22a83bee6f5232a94fbaa85231ef185da Mon Sep 17 00:00:00 2001 From: Yami An Date: Wed, 29 Nov 2023 22:10:54 +0700 Subject: [PATCH] v3.2.0 --- .../Library/JsonDeserializeBenchmark.cs | 2 +- .../Process/Library/JsonSerializeBenchmark.cs | 2 +- lib/YANLib/Ultimate/YANJson.cs | 4 +- lib/YANLib/YANBytes.cs | 2 +- lib/YANLib/YANEnum.cs | 10 ++++ lib/YANLib/YANEnumerable.cs | 11 ++-- lib/YANLib/YANJson.cs | 58 +++++++++++++++---- lib/YANLib/YANLib.csproj | 16 ++++- lib/YANLib/YANProcess.cs | 4 +- lib/YANLib/YANText.String.cs | 15 ++--- .../Implements/DeveloperTypeRedisService.cs | 6 +- .../EsServices/DeveloperEsService.cs | 4 +- .../Handlers/AdjustCertificateHandler.cs | 2 +- .../Services/CertificateService.cs | 4 +- .../Services/DeveloperService.cs | 10 ++-- .../Services/DeveloperTypeService.cs | 4 +- .../Services/YANJsonService.cs | 8 +-- .../CreateCertificateSubscriber.cs | 2 +- .../Repositories/CertificateRepository.cs | 4 +- .../Repositories/DeveloperRepository.cs | 4 +- .../Controllers/DeveloperController.cs | 4 +- .../Controllers/DeveloperTypeController.cs | 4 +- .../Controllers/ElasticsearchController.cs | 2 +- 23 files changed, 120 insertions(+), 62 deletions(-) create mode 100644 lib/YANLib/YANEnum.cs diff --git a/console/YANLib.Benchmarks/Process/Library/JsonDeserializeBenchmark.cs b/console/YANLib.Benchmarks/Process/Library/JsonDeserializeBenchmark.cs index 6233a709..948c61a7 100644 --- a/console/YANLib.Benchmarks/Process/Library/JsonDeserializeBenchmark.cs +++ b/console/YANLib.Benchmarks/Process/Library/JsonDeserializeBenchmark.cs @@ -17,7 +17,7 @@ public class JsonDeserializeBenchmark public void Setup() => _json = new SampleModel { Id = NewGuid() - }.CamelSerialize(); + }.Serialize(); [Benchmark(Baseline = true)] public void YANLib_Json() => For(0, Size, index => _json!.Deserialize()); diff --git a/console/YANLib.Benchmarks/Process/Library/JsonSerializeBenchmark.cs b/console/YANLib.Benchmarks/Process/Library/JsonSerializeBenchmark.cs index bde17197..ae1ed165 100644 --- a/console/YANLib.Benchmarks/Process/Library/JsonSerializeBenchmark.cs +++ b/console/YANLib.Benchmarks/Process/Library/JsonSerializeBenchmark.cs @@ -20,7 +20,7 @@ public class JsonSerializeBenchmark }; [Benchmark(Baseline = true)] - public void YANLib_Json() => For(0, Size, index => _model.Serialize()); + public void YANLib_Json() => For(0, Size, index => _model.StandardSerialize()); [Benchmark] public void Newtonsoft_Json() => For(0, Size, index => SerializeObject(_model)); diff --git a/lib/YANLib/Ultimate/YANJson.cs b/lib/YANLib/Ultimate/YANJson.cs index 153ca48d..c2955479 100644 --- a/lib/YANLib/Ultimate/YANJson.cs +++ b/lib/YANLib/Ultimate/YANJson.cs @@ -11,7 +11,7 @@ public static IEnumerable Serializes(this IEnumerable mdls) foreach (var mdl in mdls) { - yield return mdl.Serialize(); + yield return mdl.StandardSerialize(); } } @@ -24,7 +24,7 @@ public static IEnumerable CamelSerializes(this IEnumerable mdls) foreach (var mdl in mdls) { - yield return mdl.CamelSerialize(); + yield return mdl.Serialize(); } } diff --git a/lib/YANLib/YANBytes.cs b/lib/YANLib/YANBytes.cs index 87d683c9..ec4928f8 100644 --- a/lib/YANLib/YANBytes.cs +++ b/lib/YANLib/YANBytes.cs @@ -4,7 +4,7 @@ namespace YANLib; public static partial class YANBytes { - public static byte[]? ToByteArray(this T obj) => obj is null ? default : UTF8.GetBytes(obj.Serialize()); + public static byte[]? ToByteArray(this T obj) => obj is null ? default : UTF8.GetBytes(obj.StandardSerialize()); public static IEnumerable? ToByteArray(this IEnumerable objs) => objs.IsEmptyOrNull() ? default : objs.Select(o => o.ToByteArray()); diff --git a/lib/YANLib/YANEnum.cs b/lib/YANLib/YANEnum.cs new file mode 100644 index 00000000..23e2333a --- /dev/null +++ b/lib/YANLib/YANEnum.cs @@ -0,0 +1,10 @@ +using static System.Enum; + +namespace YANLib; + +public static partial class YANEnum +{ + public static T? ToEnum(this string value) where T : struct => value.IsWhiteSpaceOrNull() ? default : TryParse(value, out var result) ? result : default; + + public static IEnumerable? ToEnum(this IEnumerable values) where T : struct => values.IsEmptyOrNull() ? default : values.Select(s => s.ToEnum()); +} diff --git a/lib/YANLib/YANEnumerable.cs b/lib/YANLib/YANEnumerable.cs index 8417cd55..2480b558 100644 --- a/lib/YANLib/YANEnumerable.cs +++ b/lib/YANLib/YANEnumerable.cs @@ -1,4 +1,5 @@ -using static System.Math; +using System.Diagnostics.CodeAnalysis; +using static System.Math; using static System.Nullable; using static YANLib.YANNum; @@ -68,13 +69,13 @@ public static IEnumerable Clean(this IEnumerable srcs) } } - public static bool IsEmptyOrNull(this IEnumerable srcs) => srcs is null || !srcs.Any(); + public static bool IsEmptyOrNull([NotNullWhen(false)] this IEnumerable srcs) => srcs is null || !srcs.Any(); - public static bool IsEmptyOrNull(this ICollection srcs) => srcs is null || srcs.Count < 1; + public static bool IsEmptyOrNull([NotNullWhen(false)] this ICollection srcs) => srcs is null || srcs.Count < 1; - public static bool IsNotEmptyAndNull(this IEnumerable srcs) => srcs is not null && srcs.Any(); + public static bool IsNotEmptyAndNull([NotNullWhen(true)] this IEnumerable srcs) => srcs is not null && srcs.Any(); - public static bool IsNotEmptyAndNull(this ICollection srcs) => srcs is not null && srcs.Count > 0; + public static bool IsNotEmptyAndNull([NotNullWhen(true)] this ICollection srcs) => srcs is not null && srcs.Count > 0; public static bool AllEmptyOrNull(this IEnumerable srcs) where T : class => !srcs.Any(x => x is not null || x.AnyPropertiesNotDefault()); diff --git a/lib/YANLib/YANJson.cs b/lib/YANLib/YANJson.cs index cd88f4df..364fd83e 100644 --- a/lib/YANLib/YANJson.cs +++ b/lib/YANLib/YANJson.cs @@ -5,29 +5,37 @@ namespace YANLib; public static partial class YANJson { - private static readonly JsonSerializerOptions IsPropNameCaseInsJsonSerializerOpt = new() + private static readonly JsonSerializerOptions IsPropertyNameCaseInsensitive = new() { PropertyNameCaseInsensitive = true }; - private static readonly JsonSerializerOptions PropNamingPolWkCaseJsonSerializerOpt = new() + private static readonly JsonSerializerOptions CamelCasePropertyNamingPolicy = new() { PropertyNamingPolicy = CamelCase }; - public static string Serialize(this T mdl) => JsonSerializer.Serialize(mdl); + public static string StandardSerialize(this T value, JsonSerializerOptions? options = null) => options is null ? JsonSerializer.Serialize(value) : JsonSerializer.Serialize(value, options); - public static IEnumerable? Serializes(this IEnumerable mdls) => mdls.IsEmptyOrNull() ? default : mdls.Select(m => m.Serialize()); + public static IEnumerable? StandardSerializes(this IEnumerable values, JsonSerializerOptions? options = null) => values.IsEmptyOrNull() + ? default + : options is null + ? values.Select(m => m.StandardSerialize()) + : values.Select(m => m.StandardSerialize(options)); - public static string CamelSerialize(this T mdl) => JsonSerializer.Serialize(mdl, PropNamingPolWkCaseJsonSerializerOpt); + public static string Serialize(this T value, JsonSerializerOptions? options = null) => options is null ? JsonSerializer.Serialize(value, CamelCasePropertyNamingPolicy) : JsonSerializer.Serialize(value, options); - public static IEnumerable? CamelSerializes(this IEnumerable mdls) => mdls.IsEmptyOrNull() ? default : mdls.Select(m => m.CamelSerialize()); + public static IEnumerable? Serializes(this IEnumerable values, JsonSerializerOptions? options = null) => values.IsEmptyOrNull() + ? default + : options is null + ? values.Select(m => m.Serialize()) + : values.Select(m => m.Serialize(options)); - public static T? StandardDeserialize(this string str) + public static T? StandardDeserialize(this string json, JsonSerializerOptions? options = null) { try { - return JsonSerializer.Deserialize(str); + return options is null ? JsonSerializer.Deserialize(json) : JsonSerializer.Deserialize(json, options); } catch { @@ -35,13 +43,17 @@ public static partial class YANJson } } - public static IEnumerable? StandardDeserializes(this IEnumerable strs) => strs.IsEmptyOrNull() ? default : strs.Select(s => s.StandardDeserialize()); + public static IEnumerable? StandardDeserializes(this IEnumerable jsons, JsonSerializerOptions? options = null) => jsons.IsEmptyOrNull() + ? default + : options is null + ? jsons.Select(s => s.StandardDeserialize()) + : jsons.Select(s => s.StandardDeserialize(options)); - public static T? Deserialize(this string str) + public static T? Deserialize(this string json, JsonSerializerOptions? options = null) { try { - return JsonSerializer.Deserialize(str, IsPropNameCaseInsJsonSerializerOpt); + return options is null ? JsonSerializer.Deserialize(json, IsPropertyNameCaseInsensitive) : JsonSerializer.Deserialize(json, options); } catch { @@ -49,5 +61,27 @@ public static partial class YANJson } } - public static IEnumerable? Deserializes(this IEnumerable strs) => strs.IsEmptyOrNull() ? default : strs.Select(s => s.Deserialize()); + public static IEnumerable? Deserializes(this IEnumerable jsons, JsonSerializerOptions? options = null) => jsons.IsEmptyOrNull() + ? default + : options is null + ? jsons.Select(s => s.Deserialize()) + : jsons.Select(s => s.Deserialize(options)); + + public static T? Deserialize(this byte[] utf8Json, JsonSerializerOptions? options = null) + { + try + { + return options is null ? JsonSerializer.Deserialize(utf8Json, IsPropertyNameCaseInsensitive) : JsonSerializer.Deserialize(utf8Json, options); + } + catch + { + return default; + } + } + + public static IEnumerable? Deserializes(this IEnumerable jsons, JsonSerializerOptions? options = null) => jsons.IsEmptyOrNull() + ? default + : options is null + ? jsons.Select(s => s.Deserialize()) + : jsons.Select(s => s.Deserialize(options)); } diff --git a/lib/YANLib/YANLib.csproj b/lib/YANLib/YANLib.csproj index 8ecd14fa..806ec6a7 100644 --- a/lib/YANLib/YANLib.csproj +++ b/lib/YANLib/YANLib.csproj @@ -18,11 +18,23 @@ False README.md git - Update model + Add: +- Enum + +Update +- Text: check null attribute +- Json: + - byte[] + - Deserialize + - Deserializes + - StandardDeserialize + - StandardDeserializes + - CamelSerialize -> StandardSerialize + - CamelSerializes -> StandardSerializes MIT False Tynab.YANLib - 3.1.9 + 3.2.0 preview diff --git a/lib/YANLib/YANProcess.cs b/lib/YANLib/YANProcess.cs index e0023d66..72a76ec7 100644 --- a/lib/YANLib/YANProcess.cs +++ b/lib/YANLib/YANProcess.cs @@ -26,7 +26,7 @@ public static async Task KillAllProcessesByName(params string[] names) { if (names.AllNotWhiteSpaceAndNull()) { - await WhenAll(names.SelectMany(name => GetProcessesByName(name)).Select(p => + await WhenAll(names.SelectMany(GetProcessesByName).Select(p => { if (!p.CloseMainWindow()) { @@ -42,7 +42,7 @@ public static async Task KillAllProcessesByName(this IEnumerable names) { if (names.AllNotWhiteSpaceAndNull()) { - await WhenAll(names.SelectMany(name => GetProcessesByName(name)).Select(p => + await WhenAll(names.SelectMany(GetProcessesByName).Select(p => { if (!p.CloseMainWindow()) { diff --git a/lib/YANLib/YANText.String.cs b/lib/YANLib/YANText.String.cs index b1bb78d8..15a6e739 100644 --- a/lib/YANLib/YANText.String.cs +++ b/lib/YANLib/YANText.String.cs @@ -1,4 +1,5 @@ -using System.Globalization; +using System.Diagnostics.CodeAnalysis; +using System.Globalization; using static System.StringComparison; namespace YANLib; @@ -6,7 +7,7 @@ namespace YANLib; public static partial class YANText { - public static bool IsNull(this string str) => str is null; + public static bool IsNull([NotNullWhen(false)] this string str) => str is null; public static bool AllNull(params string[] strs) => strs is not null && !strs.Any(s => s.IsNotNull()); @@ -16,7 +17,7 @@ public static partial class YANText public static bool AnyNull(this IEnumerable strs) => strs is not null && strs.Any(s => s.IsNull()); - public static bool IsEmptyOrNull(this string str) => string.IsNullOrEmpty(str); + public static bool IsEmptyOrNull([NotNullWhen(false)] this string str) => string.IsNullOrEmpty(str); public static bool AllEmptyOrNull(params string[] strs) => strs is not null && !strs.Any(s => s.IsNotEmptyAndNull()); @@ -26,7 +27,7 @@ public static partial class YANText public static bool AnyEmptyOrNull(this IEnumerable strs) => strs is not null && strs.Any(s => s.IsEmptyOrNull()); - public static bool IsWhiteSpaceOrNull(this string str) => string.IsNullOrWhiteSpace(str); + public static bool IsWhiteSpaceOrNull([NotNullWhen(false)] this string str) => string.IsNullOrWhiteSpace(str); public static bool AllWhiteSpaceOrNull(params string[] strs) => strs is not null && !strs.Any(s => s.IsNotWhiteSpaceAndNull()); @@ -46,7 +47,7 @@ public static partial class YANText public static bool AnyEqualsIgnoreCase(this IEnumerable strs) => !strs.AllNotEqualsIgnoreCase(); - public static bool IsNotNull(this string str) => str is not null; + public static bool IsNotNull([NotNullWhen(true)] this string str) => str is not null; public static bool AllNotNull(params string[] strs) => strs is not null && !strs.Any(s => s.IsNull()); @@ -56,7 +57,7 @@ public static partial class YANText public static bool AnyNotNull(this IEnumerable strs) => strs is not null && strs.Any(s => s.IsNotNull()); - public static bool IsNotEmptyAndNull(this string str) => !string.IsNullOrEmpty(str); + public static bool IsNotEmptyAndNull([NotNullWhen(true)] this string str) => !string.IsNullOrEmpty(str); public static bool AllNotEmptyAndNull(params string[] strs) => strs is not null && !strs.Any(s => s.IsEmptyOrNull()); @@ -66,7 +67,7 @@ public static partial class YANText public static bool AnyNotEmptyAndNull(this IEnumerable strs) => strs is not null && strs.Any(s => s.IsNotEmptyAndNull()); - public static bool IsNotWhiteSpaceAndNull(this string str) => !string.IsNullOrWhiteSpace(str); + public static bool IsNotWhiteSpaceAndNull([NotNullWhen(true)] this string str) => !string.IsNullOrWhiteSpace(str); public static bool AllNotWhiteSpaceAndNull(params string[] strs) => strs is not null && !strs.Any(s => s.IsWhiteSpaceOrNull()); diff --git a/src/YANLib.Application.Redis/Services/Implements/DeveloperTypeRedisService.cs b/src/YANLib.Application.Redis/Services/Implements/DeveloperTypeRedisService.cs index fa4957ad..272357fd 100644 --- a/src/YANLib.Application.Redis/Services/Implements/DeveloperTypeRedisService.cs +++ b/src/YANLib.Application.Redis/Services/Implements/DeveloperTypeRedisService.cs @@ -132,7 +132,7 @@ await WhenAll((await _database.HashGetAllAsync(group.ToLowerInvariant())).Where( public async ValueTask Set(string group, string key, DeveloperTypeRedisDto value) { - var jsonVal = value.CamelSerialize(); + var jsonVal = value.Serialize(); try { @@ -156,13 +156,13 @@ public async ValueTask SetBulk(string group, IDictionary new HashEntry(p.Key.ToLowerInvariant(), p.Value.CamelSerialize())).ToArray()); + await _database.HashSetAsync(group.ToLowerInvariant(), fields.Select(p => new HashEntry(p.Key.ToLowerInvariant(), p.Value.Serialize())).ToArray()); return true; } catch (Exception ex) { - _logger.LogError(ex, "SetBulkDeveloperTypeRedisService-Exception: {Group} - {Fields}", group, fields.CamelSerialize()); + _logger.LogError(ex, "SetBulkDeveloperTypeRedisService-Exception: {Group} - {Fields}", group, fields.Serialize()); throw; } } diff --git a/src/YANLib.Application/EsServices/DeveloperEsService.cs b/src/YANLib.Application/EsServices/DeveloperEsService.cs index 23a7427a..a3b1a9f4 100644 --- a/src/YANLib.Application/EsServices/DeveloperEsService.cs +++ b/src/YANLib.Application/EsServices/DeveloperEsService.cs @@ -47,7 +47,7 @@ public async ValueTask Set(DeveloperIndex data) } catch (Exception ex) { - _logger.LogError(ex, "SetDeveloperEsService-Exception: {Data}", data.CamelSerialize()); + _logger.LogError(ex, "SetDeveloperEsService-Exception: {Data}", data.Serialize()); throw; } } @@ -75,7 +75,7 @@ public async ValueTask SetBulk(List datas) } catch (Exception ex) { - _logger.LogError(ex, "SetBulkDeveloperEsService-Exception: {Datas}", datas.CamelSerialize()); + _logger.LogError(ex, "SetBulkDeveloperEsService-Exception: {Datas}", datas.Serialize()); throw; } } diff --git a/src/YANLib.Application/Handlers/AdjustCertificateHandler.cs b/src/YANLib.Application/Handlers/AdjustCertificateHandler.cs index c9cbb716..c244e362 100644 --- a/src/YANLib.Application/Handlers/AdjustCertificateHandler.cs +++ b/src/YANLib.Application/Handlers/AdjustCertificateHandler.cs @@ -20,7 +20,7 @@ ICertificateService certificateService #region Implements public async Task HandleEventAsync(CertificateAdjustEto eventData) { - _logger.LogInformation("AdjustCertificateHandler-Subscribe: {EventData}", eventData.CamelSerialize()); + _logger.LogInformation("AdjustCertificateHandler-Subscribe: {EventData}", eventData.Serialize()); _logger.LogInformation("AdjustCertificateHandler-UpdateCertificateService: {Responses}", await _certificateService.Update(ObjectMapper.Map(eventData))); } #endregion diff --git a/src/YANLib.Application/Services/CertificateService.cs b/src/YANLib.Application/Services/CertificateService.cs index a061561b..54b1ccf9 100644 --- a/src/YANLib.Application/Services/CertificateService.cs +++ b/src/YANLib.Application/Services/CertificateService.cs @@ -26,7 +26,7 @@ public async ValueTask Create(CertificateRequest request) } catch (Exception ex) { - _logger.LogError(ex, "CreateCertificateService-Exception: {Request}", request.CamelSerialize()); + _logger.LogError(ex, "CreateCertificateService-Exception: {Request}", request.Serialize()); throw; } } @@ -39,7 +39,7 @@ public async ValueTask Update(CertificateRequest request) } catch (Exception ex) { - _logger.LogError(ex, "UpdateCertificateService-Exception: {Request}", request.CamelSerialize()); + _logger.LogError(ex, "UpdateCertificateService-Exception: {Request}", request.Serialize()); throw; } } diff --git a/src/YANLib.Application/Services/DeveloperService.cs b/src/YANLib.Application/Services/DeveloperService.cs index 5884d85f..2cb2ccf7 100644 --- a/src/YANLib.Application/Services/DeveloperService.cs +++ b/src/YANLib.Application/Services/DeveloperService.cs @@ -97,7 +97,7 @@ public async ValueTask Create(DeveloperCreateRequest request) var eto = ObjectMapper.Map(cert); await _capPublisher.PublishAsync(CERT_CRT, eto); - _logger.LogInformation("InsertDeveloperService-Publish: {ETO}", eto.CamelSerialize()); + _logger.LogInformation("InsertDeveloperService-Publish: {ETO}", eto.Serialize()); }); rslt.Certificates = new List(ObjectMapper.Map, List>(certs)); @@ -107,7 +107,7 @@ public async ValueTask Create(DeveloperCreateRequest request) } catch (Exception ex) { - _logger.LogError(ex, "CreateDeveloperService-Exception: {Request}", request.CamelSerialize()); + _logger.LogError(ex, "CreateDeveloperService-Exception: {Request}", request.Serialize()); throw; } } @@ -149,7 +149,7 @@ public async ValueTask Adjust(string idCard, DeveloperUpdateR var eto = ObjectMapper.Map(cert); await _capPublisher.PublishAsync(CERT_CRT, eto); - _logger.LogInformation("AdjustDeveloperService-Publish: {ETO}", eto.CamelSerialize()); + _logger.LogInformation("AdjustDeveloperService-Publish: {ETO}", eto.Serialize()); }); rslt.Certificates = new List(ObjectMapper.Map, List>(certs)); @@ -164,7 +164,7 @@ public async ValueTask Adjust(string idCard, DeveloperUpdateR var eto = ObjectMapper.Map(x); await _distributedEventBus.PublishAsync(eto); - _logger.LogInformation("AdjustDeveloperService-Publish: {ETO}", eto.CamelSerialize()); + _logger.LogInformation("AdjustDeveloperService-Publish: {ETO}", eto.Serialize()); }); rslt.Certificates = new List(mdl.Certificates); @@ -174,7 +174,7 @@ public async ValueTask Adjust(string idCard, DeveloperUpdateR } catch (Exception ex) { - _logger.LogError(ex, "AdjustDeveloperService-Exception: {IdCard} - {DTO}", idCard, dto.CamelSerialize()); + _logger.LogError(ex, "AdjustDeveloperService-Exception: {IdCard} - {DTO}", idCard, dto.Serialize()); throw; } } diff --git a/src/YANLib.Application/Services/DeveloperTypeService.cs b/src/YANLib.Application/Services/DeveloperTypeService.cs index a6941830..c49a857c 100644 --- a/src/YANLib.Application/Services/DeveloperTypeService.cs +++ b/src/YANLib.Application/Services/DeveloperTypeService.cs @@ -89,7 +89,7 @@ public async ValueTask Create(DeveloperTypeCreateRequest } catch (Exception ex) { - _logger.LogError(ex, "CreateDeveloperTypeService-Exception: {Request}", request.CamelSerialize()); + _logger.LogError(ex, "CreateDeveloperTypeService-Exception: {Request}", request.Serialize()); throw; } } @@ -119,7 +119,7 @@ public async ValueTask Update(int code, DeveloperTypeUpda } catch (Exception ex) { - _logger.LogError(ex, "UpdateDeveloperTypeService-Exception: {Request}", request.CamelSerialize()); + _logger.LogError(ex, "UpdateDeveloperTypeService-Exception: {Request}", request.Serialize()); throw; } } diff --git a/src/YANLib.Application/Services/YANJsonService.cs b/src/YANLib.Application/Services/YANJsonService.cs index 603ec262..fd3983a5 100644 --- a/src/YANLib.Application/Services/YANJsonService.cs +++ b/src/YANLib.Application/Services/YANJsonService.cs @@ -23,12 +23,12 @@ public async ValueTask YanVsStandards(uint quantity, bool hideSystem) var json = new JsonResponse { Id = NewGuid() - }.Serialize(); + }.StandardSerialize(); var jsonCamel = new JsonResponse { Id = NewGuid() - }.CamelSerialize(); + }.Serialize(); var newtonsoftTask = Run(() => { @@ -160,12 +160,12 @@ public async ValueTask YanVsStandards(uint quantity, bool hideSystem) public ValueTask JsonSerialize(Guid id) => ValueTask.FromResult(new JsonResponse { Id = id - }.Serialize()); + }.StandardSerialize()); public ValueTask JsonSerializeOptionalName(Guid idOptionalName) => ValueTask.FromResult(new JsonOptionalNameResponse { Id = idOptionalName - }.Serialize()); + }.StandardSerialize()); public ValueTask JsonDeserialize(string json) => ValueTask.FromResult(json.Deserialize()); diff --git a/src/YANLib.Application/Subscribers/CreateCertificateSubscriber.cs b/src/YANLib.Application/Subscribers/CreateCertificateSubscriber.cs index 0026d3f0..5193fd89 100644 --- a/src/YANLib.Application/Subscribers/CreateCertificateSubscriber.cs +++ b/src/YANLib.Application/Subscribers/CreateCertificateSubscriber.cs @@ -22,7 +22,7 @@ ICertificateService certificateService [CapSubscribe(CERT_CRT)] public async Task Subscibe(CertificateCreateEto eventData) { - _logger.LogInformation("CreateCertificateSubscriber-Subscribe: {EventData}", eventData.CamelSerialize()); + _logger.LogInformation("CreateCertificateSubscriber-Subscribe: {EventData}", eventData.Serialize()); _logger.LogInformation("CreateCertificateSubscriber-CreateCertificateService: {Responses}", await _certificateService.Create(ObjectMapper.Map(eventData))); } #endregion diff --git a/src/YANLib.EntityFrameworkCore/Repositories/CertificateRepository.cs b/src/YANLib.EntityFrameworkCore/Repositories/CertificateRepository.cs index 81a23a98..5ddb2322 100644 --- a/src/YANLib.EntityFrameworkCore/Repositories/CertificateRepository.cs +++ b/src/YANLib.EntityFrameworkCore/Repositories/CertificateRepository.cs @@ -43,7 +43,7 @@ public async ValueTask Create(Certificate entity) } catch (Exception ex) { - _logger.LogError(ex, "CreateCertificateRepository-Exception: {Entity}", entity.CamelSerialize()); + _logger.LogError(ex, "CreateCertificateRepository-Exception: {Entity}", entity.Serialize()); throw; } } @@ -65,7 +65,7 @@ public async ValueTask Update(Certificate entity) } catch (Exception ex) { - _logger.LogError(ex, "UpdateCertificateRepository-Exception: {Entity}", entity.CamelSerialize()); + _logger.LogError(ex, "UpdateCertificateRepository-Exception: {Entity}", entity.Serialize()); throw; } } diff --git a/src/YANLib.EntityFrameworkCore/Repositories/DeveloperRepository.cs b/src/YANLib.EntityFrameworkCore/Repositories/DeveloperRepository.cs index e5dba92b..6d631c50 100644 --- a/src/YANLib.EntityFrameworkCore/Repositories/DeveloperRepository.cs +++ b/src/YANLib.EntityFrameworkCore/Repositories/DeveloperRepository.cs @@ -52,7 +52,7 @@ public async ValueTask Create(Developer entity) } catch (Exception ex) { - _logger.LogError(ex, "CreateDeveloperRepository-Exception: {Entity}", entity.CamelSerialize()); + _logger.LogError(ex, "CreateDeveloperRepository-Exception: {Entity}", entity.Serialize()); throw; } } @@ -87,7 +87,7 @@ public async ValueTask Adjust(Developer entity) } catch (Exception ex) { - _logger.LogError(ex, "AdjustDeveloperRepository-Exception: {Entity}", entity.CamelSerialize()); + _logger.LogError(ex, "AdjustDeveloperRepository-Exception: {Entity}", entity.Serialize()); throw; } } diff --git a/src/YANLib.HttpApi/Controllers/DeveloperController.cs b/src/YANLib.HttpApi/Controllers/DeveloperController.cs index 4c15d965..3e85883b 100644 --- a/src/YANLib.HttpApi/Controllers/DeveloperController.cs +++ b/src/YANLib.HttpApi/Controllers/DeveloperController.cs @@ -33,7 +33,7 @@ public async ValueTask GetByIdCard(string idCard) [SwaggerOperation(Summary = "Thêm mới Developer")] public async ValueTask Create([Required] DeveloperCreateRequest request) { - _logger.LogInformation("CreateDeveloperController: {Request}", request.CamelSerialize()); + _logger.LogInformation("CreateDeveloperController: {Request}", request.Serialize()); return Ok(await _service.Create(request)); } @@ -42,7 +42,7 @@ public async ValueTask Create([Required] DeveloperCreateRequest r [SwaggerOperation(Summary = "Cập nhật Developer")] public async ValueTask Adjust(string idCard, [Required] DeveloperUpdateRequest request) { - _logger.LogInformation("AdjustDeveloperController: {IdCard} - {Request}", idCard, request.CamelSerialize()); + _logger.LogInformation("AdjustDeveloperController: {IdCard} - {Request}", idCard, request.Serialize()); return Ok(await _service.Adjust(idCard, request)); } diff --git a/src/YANLib.HttpApi/Controllers/DeveloperTypeController.cs b/src/YANLib.HttpApi/Controllers/DeveloperTypeController.cs index 084e4390..13d3359e 100644 --- a/src/YANLib.HttpApi/Controllers/DeveloperTypeController.cs +++ b/src/YANLib.HttpApi/Controllers/DeveloperTypeController.cs @@ -37,7 +37,7 @@ public async ValueTask Get(int code) [SwaggerOperation(Summary = "Thêm mới định nghĩa Developer Type")] public async ValueTask Create([Required] DeveloperTypeCreateRequest request) { - _logger.LogInformation("CreateDeveloperTypeController: {Request}", request.CamelSerialize()); + _logger.LogInformation("CreateDeveloperTypeController: {Request}", request.Serialize()); return Ok(await _service.Create(request)); } @@ -46,7 +46,7 @@ public async ValueTask Create([Required] DeveloperTypeCreateReque [SwaggerOperation(Summary = "Cập nhật định nghĩa Developer Type")] public async ValueTask Update(int code, [Required] DeveloperTypeUpdateRequest request) { - _logger.LogInformation("UpdateDeveloperTypeController: {Code} - {Request}", code, request.CamelSerialize()); + _logger.LogInformation("UpdateDeveloperTypeController: {Code} - {Request}", code, request.Serialize()); return Ok(await _service.Update(code, request)); } diff --git a/src/YANLib.HttpApi/Controllers/ElasticsearchController.cs b/src/YANLib.HttpApi/Controllers/ElasticsearchController.cs index 1acb42f2..0a047f0c 100644 --- a/src/YANLib.HttpApi/Controllers/ElasticsearchController.cs +++ b/src/YANLib.HttpApi/Controllers/ElasticsearchController.cs @@ -33,7 +33,7 @@ public async ValueTask Get(string id) [SwaggerOperation(Summary = "Thêm mới Developer trên Elasticsearch")] public async ValueTask Set([Required] DeveloperIndex request) { - _logger.LogInformation("SetElasticsearchController: {Request}", request.CamelSerialize()); + _logger.LogInformation("SetElasticsearchController: {Request}", request.Serialize()); return Ok(await _developerEsService.Set(request)); }