AS1024
/
GeoFeed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move away from Newtonsoft.Json

This commit is contained in:
Jeff Leung 2024-01-05 16:51:28 -08:00
parent 04d00e0fe9
commit 14f8ea618a
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AS1024.GeoFeed/AS1024.GeoFeed.csproj
View File

@ -10,7 +10,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
</Project>

6
AS1024.GeoFeed/GeoFeedBuilder/NetBoxGeoFeedProvider.cs
View File

@ -1,6 +1,6 @@
using AS1024.GeoFeed.Interfaces;
using AS1024.GeoFeed.Models;
using Newtonsoft.Json;
using System.Text.Json;
using System.Net.Http.Headers;
using System.Net.Sockets;
using System.Web;
@ -49,7 +49,9 @@ namespace AS1024.GeoFeed.GeoFeedBuilder
if (result.IsSuccessStatusCode)
{
string stringResult = await result.Content.ReadAsStringAsync();
jsonData = JsonConvert.DeserializeObject<NetboxData>(stringResult);
jsonData = JsonSerializer.Deserialize<NetboxData>(stringResult, new JsonSerializerOptions {
PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower
});
if (jsonData?.Results == null || jsonData.Results.Count == 0)
{

9
AS1024.GeoFeed/Models/GeoFeed.cs
View File

@ -1,5 +1,4 @@
using Newtonsoft.Json;
using System.Text.Json.Serialization;
namespace AS1024.GeoFeed.Models
{
public class NetboxData
@ -12,21 +11,15 @@ namespace AS1024.GeoFeed.Models
public class Result
{
public string? Prefix { get; set; }
[JsonProperty("custom_fields")]
public CustomFields? CustomFields { get; set; }
}
public class CustomFields
{
[JsonProperty("geoloc_city")]
public string? GeolocCity { get; set; }
[JsonProperty("geoloc_country")]
public string? GeolocCountry { get; set; }
[JsonProperty("geoloc_has_location")]
public bool? GeolocHasLocation { get; set; }
[JsonProperty("geoloc_region")]
public string? GeolocRegion { get; set; }
[JsonProperty("geoloc_postal_code")]
public string? GeolocPostalCode { get; set; }
}