Merge pull request #44 from easykeys/bug/fedex/api/addressvalidation

Updated versioning and enhanced JSON serialization

GitVersion.yml

@@ -1,5 +1,5 @@
 mode: Mainline
-next-version: 4.0.0
+next-version: 4.0.1
 branches:
   feature:
     tag: preview

build/settings.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup Label="Basic Settings">
-	<VersionPrefix>4.0.0-preview1</VersionPrefix>
+	<VersionPrefix>4.0.1-preview1</VersionPrefix>
 	<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
 	<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
 	<NoWarn>$(NoWarn);CS1591;NU1605;DS126858;DS137138;SA1010;SA1011</NoWarn>

src/EasyKeys.Shipping.FedEx.AddressValidation/Client/V1/Models/Response/Alert.cs

@@ -1,10 +1,15 @@
-namespace EasyKeys.Shipping.FedEx.AddressValidation.Client.V1.Models.Response;
+using System.Text.Json.Serialization;
+
+namespace EasyKeys.Shipping.FedEx.AddressValidation.Client.V1.Models.Response;
 
 public class Alert
 {
+    [JsonPropertyName("code")]
     public string Code { get; set; } = string.Empty;
 
+    [JsonPropertyName("message")]
     public string Message { get; set; } = string.Empty;
 
+    [JsonPropertyName("alertType")]
     public string AlertType { get; set; } = string.Empty;
 }

src/EasyKeys.Shipping.FedEx.AddressValidation/Client/V1/Models/Response/Attributes.cs

@@ -0,0 +1,81 @@
+using System.Text.Json.Serialization;
+
+namespace EasyKeys.Shipping.FedEx.AddressValidation.Client.V1.Models.Response;
+
+public class Attributes
+{
+    [JsonPropertyName("POBox")]
+    public bool? POBox { get; set; }
+
+    [JsonPropertyName("POBoxOnlyZIP")]
+    public bool? POBoxOnlyZIP { get; set; }
+
+    [JsonPropertyName("SplitZip")]
+    public bool? SplitZip { get; set; }
+
+    [JsonPropertyName("SuiteRequiredButMissing")]
+    public bool? SuiteRequiredButMissing { get; set; }
+
+    [JsonPropertyName("InvalidSuiteNumber")]
+    public bool? InvalidSuiteNumber { get; set; }
+
+    [JsonPropertyName("ResolutionInput")]
+    public string? ResolutionInput { get; set; }
+
+    [JsonPropertyName("DPV")]
+    public bool? DPV { get; set; }
+
+    [JsonPropertyName("ResolutionMethod")]
+    public string? ResolutionMethod { get; set; }
+
+    [JsonPropertyName("DataVintage")]
+    public string? DataVintage { get; set; }
+
+    [JsonPropertyName("MatchSource")]
+    public string? MatchSource { get; set; }
+
+    [JsonPropertyName("CountrySupported")]
+    public bool? CountrySupported { get; set; }
+
+    [JsonPropertyName("ValidlyFormed")]
+    public bool? ValidlyFormed { get; set; }
+
+    [JsonPropertyName("Matched")]
+    public bool? Matched { get; set; }
+
+    [JsonPropertyName("Resolved")]
+    public bool? Resolved { get; set; }
+
+    [JsonPropertyName("Inserted")]
+    public bool? Inserted { get; set; }
+
+    [JsonPropertyName("MultiUnitBase")]
+    public bool? MultiUnitBase { get; set; }
+
+    [JsonPropertyName("ZIP11Match")]
+    public bool? ZIP11Match { get; set; }
+
+    [JsonPropertyName("ZIP4Match")]
+    public bool? ZIP4Match { get; set; }
+
+    [JsonPropertyName("UniqueZIP")]
+    public bool? UniqueZIP { get; set; }
+
+    [JsonPropertyName("StreetAddress")]
+    public bool? StreetAddress { get; set; }
+
+    [JsonPropertyName("RRConversion")]
+    public bool? RRConversion { get; set; }
+
+    [JsonPropertyName("ValidMultiUnit")]
+    public bool? ValidMultiUnit { get; set; }
+
+    [JsonPropertyName("AddressType")]
+    public string? AddressType { get; set; }
+
+    [JsonPropertyName("AddressPrecision")]
+    public string? AddressPrecision { get; set; }
+
+    [JsonPropertyName("MultipleMatches")]
+    public bool? MultipleMatches { get; set; }
+}

src/EasyKeys.Shipping.FedEx.AddressValidation/Client/V1/Models/Response/Output.cs

@@ -1,8 +1,12 @@
-namespace EasyKeys.Shipping.FedEx.AddressValidation.Client.V1.Models.Response;
+using System.Text.Json.Serialization;
+
+namespace EasyKeys.Shipping.FedEx.AddressValidation.Client.V1.Models.Response;
 
 public class Output
 {
+    [JsonPropertyName("resolvedAddresses")]
     public List<ResolvedAddress>? ResolvedAddresses { get; set; }
 
-    public List<Alert>? Alerts { get; set; }
+    [JsonPropertyName("alerts")]
+    public List<Alert> Alerts { get; set; } = new ();
 }

src/EasyKeys.Shipping.FedEx.AddressValidation/Client/V1/Models/Response/ParsedPostalCode.cs

@@ -1,10 +1,15 @@
-namespace EasyKeys.Shipping.FedEx.AddressValidation.Client.V1.Models.Response;
+using System.Text.Json.Serialization;
+
+namespace EasyKeys.Shipping.FedEx.AddressValidation.Client.V1.Models.Response;
 
 public class ParsedPostalCode
 {
+    [JsonPropertyName("base")]
     public string? Base { get; set; }
 
+    [JsonPropertyName("addOn")]
     public string? AddOn { get; set; }
 
+    [JsonPropertyName("deliveryPoint")]
     public string? DeliveryPoint { get; set; }
 }

src/EasyKeys.Shipping.FedEx.AddressValidation/Client/V1/Models/Response/ResolutionToken.cs

@@ -1,8 +1,12 @@
-namespace EasyKeys.Shipping.FedEx.AddressValidation.Client.V1.Models.Response;
+using System.Text.Json.Serialization;
+
+namespace EasyKeys.Shipping.FedEx.AddressValidation.Client.V1.Models.Response;
 
 public class ResolutionToken
 {
-    public bool Changed { get; set; }
+    [JsonPropertyName("changed")]
+    public bool? Changed { get; set; }
 
+    [JsonPropertyName("value")]
     public string? Value { get; set; }
 }

src/EasyKeys.Shipping.FedEx.AddressValidation/Client/V1/Models/Response/ResolvedAddress.cs

@@ -1,36 +1,54 @@
-namespace EasyKeys.Shipping.FedEx.AddressValidation.Client.V1.Models.Response;
+using System.Text.Json.Serialization;
+
+namespace EasyKeys.Shipping.FedEx.AddressValidation.Client.V1.Models.Response;
 
 public class ResolvedAddress
 {
+    [JsonPropertyName("streetLinesToken")]
     public string[]? StreetLinesToken { get; set; }
 
+    [JsonPropertyName("city")]
     public string? City { get; set; }
 
+    [JsonPropertyName("stateOrProvinceCode")]
     public string? StateOrProvinceCode { get; set; }
 
+    [JsonPropertyName("countryCode")]
     public string? CountryCode { get; set; }
 
-    public List<CustomerMessage>? CustomerMessage { get; set; }
+    [JsonPropertyName("customerMessage")]
+    public List<ResolutionToken>? CustomerMessage { get; set; }
 
+    [JsonPropertyName("cityToken")]
     public List<ResolutionToken>? CityToken { get; set; }
 
+    [JsonPropertyName("postalCodeToken")]
     public ResolutionToken? PostalCodeToken { get; set; }
 
+    [JsonPropertyName("parsedPostalCode")]
     public ParsedPostalCode? ParsedPostalCode { get; set; }
 
+    [JsonPropertyName("classification")]
     public string? Classification { get; set; }
 
-    public bool PostOfficeBox { get; set; }
+    [JsonPropertyName("postOfficeBox")]
+    public bool? PostOfficeBox { get; set; }
 
-    public bool NormalizedStatusNameDPV { get; set; }
+    [JsonPropertyName("normalizedStatusNameDPV")]
+    public bool? NormalizedStatusNameDPV { get; set; }
 
+    [JsonPropertyName("standardizedStatusNameMatchSource")]
     public string? StandardizedStatusNameMatchSource { get; set; }
 
+    [JsonPropertyName("resolutionMethodName")]
     public string? ResolutionMethodName { get; set; }
 
-    public bool RuralRouteHighwayContract { get; set; }
+    [JsonPropertyName("ruralRouteHighwayContract")]
+    public bool? RuralRouteHighwayContract { get; set; }
 
-    public bool GeneralDelivery { get; set; }
+    [JsonPropertyName("generalDelivery")]
+    public bool? GeneralDelivery { get; set; }
 
+    [JsonPropertyName("attributes")]
     public Dictionary<string, object> Attributes { get; set; } = new ();
 }