diff --git a/SimcProfileParser.Tests/SimcParserService_ParseProfileTests.cs b/SimcProfileParser.Tests/SimcParserService_ParseProfileTests.cs index ae95549..4aea16c 100644 --- a/SimcProfileParser.Tests/SimcParserService_ParseProfileTests.cs +++ b/SimcProfileParser.Tests/SimcParserService_ParseProfileTests.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.Logging; -using Newtonsoft.Json; using NUnit.Framework; using NUnit.Framework.Legacy; using Serilog; @@ -8,6 +7,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Text.Json; using System.Threading.Tasks; namespace SimcProfileParser.Tests @@ -241,8 +241,8 @@ public void SPS_Parses_Professions() }; // Act - var expectedProfessions = JsonConvert.SerializeObject(professions); - var actualProfessions = JsonConvert.SerializeObject(ParsedProfile.Professions); + var expectedProfessions = JsonSerializer.Serialize(professions); + var actualProfessions = JsonSerializer.Serialize(ParsedProfile.Professions); // Assert ClassicAssert.IsNotNull(ParsedProfile); @@ -270,8 +270,8 @@ public void SPS_Parses_Items() }; // Act - var expectedItem = JsonConvert.SerializeObject(fourthItem); - var actualItem = JsonConvert.SerializeObject(ParsedProfile.Items[3]); + var expectedItem = JsonSerializer.Serialize(fourthItem); + var actualItem = JsonSerializer.Serialize(ParsedProfile.Items[3]); // Assert ClassicAssert.IsNotNull(ParsedProfile); @@ -300,8 +300,8 @@ public void SPS_Parses_ItemLevelSpecific() }; // Act - var expectedItem = JsonConvert.SerializeObject(sixteenthItem); - var actualItem = JsonConvert.SerializeObject(ParsedProfile.Items[15]); + var expectedItem = JsonSerializer.Serialize(sixteenthItem); + var actualItem = JsonSerializer.Serialize(ParsedProfile.Items[15]); // Assert ClassicAssert.IsNotNull(ParsedProfile); @@ -334,8 +334,8 @@ public void SPS_Parses_CraftedItemStats() }; // Act - var expectedItem = JsonConvert.SerializeObject(seventhItem); - var actualItem = JsonConvert.SerializeObject(ParsedProfile.Items[7]); + var expectedItem = JsonSerializer.Serialize(seventhItem); + var actualItem = JsonSerializer.Serialize(ParsedProfile.Items[7]); // Assert ClassicAssert.IsNotNull(ParsedProfile); diff --git a/SimcProfileParser/DataSync/CacheService.cs b/SimcProfileParser/DataSync/CacheService.cs index 7ed95e5..0ded226 100644 --- a/SimcProfileParser/DataSync/CacheService.cs +++ b/SimcProfileParser/DataSync/CacheService.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.Logging; -using Newtonsoft.Json; using SimcProfileParser.Interfaces.DataSync; using SimcProfileParser.Model.DataSync; using System; @@ -9,6 +8,7 @@ using System.Linq; using System.Net; using System.Net.Http; +using System.Text.Json; using System.Threading.Tasks; namespace SimcProfileParser.DataSync @@ -239,7 +239,7 @@ async Task ICacheService.GetParsedFileContentsAsync(SimcParsedFileType fil var fileText = await File.ReadAllTextAsync(localPath); - var deserialisedData = JsonConvert.DeserializeObject(fileText); + var deserialisedData = JsonSerializer.Deserialize(fileText); _cachedFileData.Add(fileType, deserialisedData); @@ -268,7 +268,7 @@ async Task ICacheService.GenerateParsedFileAsync(SimcParsedFileType fileType) var localPath = Path.Combine(BaseFileDirectory, configuration.LocalParsedFile); _logger?.LogTrace("Saving parsed json data for [{configuration.ParsedFileType}] to [{localPath}]", configuration.ParsedFileType, localPath); - await File.WriteAllTextAsync(localPath, JsonConvert.SerializeObject(parsedData)); + await File.WriteAllTextAsync(localPath, JsonSerializer.Serialize(parsedData)); } void ICacheService.RegisterFileConfiguration(CacheFileConfiguration configuration) @@ -457,7 +457,7 @@ internal async Task> GetCacheDataAsync(bool force = false) { var data = await File.ReadAllTextAsync(cacheDataFile); - var deserialised = JsonConvert.DeserializeObject>(data); + var deserialised = JsonSerializer.Deserialize>(data); if (deserialised != null) results = deserialised; @@ -476,7 +476,7 @@ internal async Task SaveCacheDataAsync(List data) Directory.CreateDirectory(baseDirectory.OriginalString); var cacheDataFile = Path.Combine(BaseFileDirectory, _etagCacheDataFile); - var dataString = JsonConvert.SerializeObject(data, Formatting.Indented); + var dataString = JsonSerializer.Serialize(data, new JsonSerializerOptions { WriteIndented = true }); await File.WriteAllTextAsync(cacheDataFile, dataString); } diff --git a/SimcProfileParser/SimcItemCreationService.cs b/SimcProfileParser/SimcItemCreationService.cs index 195833f..18dc7fd 100644 --- a/SimcProfileParser/SimcItemCreationService.cs +++ b/SimcProfileParser/SimcItemCreationService.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.Logging; -using Newtonsoft.Json; using SimcProfileParser.Interfaces; using SimcProfileParser.Interfaces.DataSync; using SimcProfileParser.Model.DataSync; @@ -9,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Text.Json; using System.Threading.Tasks; namespace SimcProfileParser @@ -333,7 +333,7 @@ internal async Task ProcessBonusIdsAsync(SimcItem item, IList bonusIds, int break; default: - var entryString = JsonConvert.SerializeObject(entry); + var entryString = JsonSerializer.Serialize(entry); _logger?.LogTrace($"[{item.ItemId}] [{bonusId}:{entry.Type}] Unknown bonus entry: {entry.Type} ({bonusId}): {entryString}"); break; } diff --git a/SimcProfileParser/SimcProfileParser.csproj b/SimcProfileParser/SimcProfileParser.csproj index e22a15c..aae83db 100644 --- a/SimcProfileParser/SimcProfileParser.csproj +++ b/SimcProfileParser/SimcProfileParser.csproj @@ -34,6 +34,5 @@ -