From 71b7d3ab37fe73d69b1db556085258a35254f141 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 16 Dec 2022 20:35:28 +0000 Subject: [PATCH] Use source generator for device report JSON serializing. --- Aaru.CommonTypes | 2 +- Aaru.Core/Remote.cs | 6 +----- Aaru/Commands/Device/DeviceReport.cs | 6 +----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes index 29c1776fa..177683a25 160000 --- a/Aaru.CommonTypes +++ b/Aaru.CommonTypes @@ -1 +1 @@ -Subproject commit 29c1776fabcc3f1b3dfa8fb419cbfd83c6418166 +Subproject commit 177683a25548b14a4d961c72d732df0ed8b6756b diff --git a/Aaru.Core/Remote.cs b/Aaru.Core/Remote.cs index b1eb58fb7..eec320ce1 100644 --- a/Aaru.Core/Remote.cs +++ b/Aaru.Core/Remote.cs @@ -68,11 +68,7 @@ public static class Remote try { - string json = JsonSerializer.Serialize(report, new JsonSerializerOptions() - { - DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull, - WriteIndented = true - }); + string json = JsonSerializer.Serialize(report, typeof(DeviceReport), DeviceReportContext.Default); var httpClient = new HttpClient(); diff --git a/Aaru/Commands/Device/DeviceReport.cs b/Aaru/Commands/Device/DeviceReport.cs index 9c00830f6..9c08833cb 100644 --- a/Aaru/Commands/Device/DeviceReport.cs +++ b/Aaru/Commands/Device/DeviceReport.cs @@ -1576,11 +1576,7 @@ sealed class DeviceReportCommand : Command var jsonFs = new FileStream(jsonFile, FileMode.Create); - JsonSerializer.Serialize(jsonFs, report, new JsonSerializerOptions() - { - WriteIndented = true, - DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull - }); + JsonSerializer.Serialize(jsonFs, report, typeof(DeviceReport), DeviceReportContext.Default); jsonFs.Close();