Skip to content

Replace Newtonsoft.Json with System.Text.Json #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Niphyr merged 1 commit into from
Oct 25, 2025
Merged

Replace Newtonsoft.Json with System.Text.Json #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions SimcProfileParser.Tests/SimcParserService_ParseProfileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using NUnit.Framework;
using NUnit.Framework.Legacy;
using Serilog;
Expand All @@ -8,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text.Json;
using System.Threading.Tasks;

namespace SimcProfileParser.Tests
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions SimcProfileParser/DataSync/CacheService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using SimcProfileParser.Interfaces.DataSync;
using SimcProfileParser.Model.DataSync;
using System;
Expand All @@ -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
Expand Down Expand Up @@ -239,7 +239,7 @@ async Task<T> ICacheService.GetParsedFileContentsAsync<T>(SimcParsedFileType fil

var fileText = await File.ReadAllTextAsync(localPath);

var deserialisedData = JsonConvert.DeserializeObject<T>(fileText);
var deserialisedData = JsonSerializer.Deserialize<T>(fileText);

_cachedFileData.Add(fileType, deserialisedData);

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -457,7 +457,7 @@ internal async Task<List<FileETag>> GetCacheDataAsync(bool force = false)
{
var data = await File.ReadAllTextAsync(cacheDataFile);

var deserialised = JsonConvert.DeserializeObject<List<FileETag>>(data);
var deserialised = JsonSerializer.Deserialize<List<FileETag>>(data);

if (deserialised != null)
results = deserialised;
Expand All @@ -476,7 +476,7 @@ internal async Task SaveCacheDataAsync(List<FileETag> 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);
}
Expand Down
4 changes: 2 additions & 2 deletions SimcProfileParser/SimcItemCreationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using SimcProfileParser.Interfaces;
using SimcProfileParser.Interfaces.DataSync;
using SimcProfileParser.Model.DataSync;
Expand All @@ -9,6 +8,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;

namespace SimcProfileParser
Expand Down Expand Up @@ -333,7 +333,7 @@ internal async Task ProcessBonusIdsAsync(SimcItem item, IList<int> 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;
}
Expand Down
1 change: 0 additions & 1 deletion SimcProfileParser/SimcProfileParser.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,5 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
</ItemGroup>
</Project>