Merge pull request #91 from ShipEngine/jpill/update-converters

fix: update converter references to resolve enum values
ShipEngine · Jun 12, 2024 · e83729a · e83729a
2 parents 15dfaf5 + f3aaf9f
commit e83729a
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -109,4 +109,10 @@ Added custom converter to fallback to default unspecified error code if value ca
 
 ### Changed
 
-Updated to .NET 8.0, removed Newtonsoft.Json dependency, and updated to System.Text.Json
+Updated to .NET 8.0, removed Newtonsoft.Json dependency, and updated to System.Text.Json
+
+## 2.0.1
+
+### Changed
+
+Updated references to use proper converter to resolve enum string values
diff --git a/ShipEngine/Models/Dto/Common/Address.cs b/ShipEngine/Models/Dto/Common/Address.cs
@@ -62,7 +62,7 @@ public class Address
         /// <summary>
         /// Indicates whether the address is residential or commercial, if known.
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public AddressResidentialIndicator? AddressResidentialIndicator { get; set; }
     }
 }
diff --git a/ShipEngine/Models/Dto/Common/AdvancedShipmentOptions.cs b/ShipEngine/Models/Dto/Common/AdvancedShipmentOptions.cs
@@ -23,7 +23,7 @@ public class AdvancedShipmentOptions
         /// Indicates whether to bill shipping costs to the recipient or to a third-party.
         /// When billing to a third-party, the bill_to_account, bill_to_country_code, and bill_to_postal_code fields must also be set.
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public BillToParty? BillToParty { get; set; }
 
         /// <summary>
@@ -96,7 +96,7 @@ public class AdvancedShipmentOptions
         /// <summary>
         /// Indicates if the package will be picked up or dropped off by the carrier
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public OriginType? OriginType { get; set; }
 
         /// <summary>

diff --git a/ShipEngine/Models/Dto/Common/CollectOnDelivery.cs b/ShipEngine/Models/Dto/Common/CollectOnDelivery.cs
@@ -12,7 +12,7 @@ public class CollectOnDelivery
         /// <summary>
         /// Types of payment that are supported
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public PaymentType? PaymentType { get; set; }
 
         /// <summary>

diff --git a/ShipEngine/Models/Dto/Common/Customs.cs b/ShipEngine/Models/Dto/Common/Customs.cs
@@ -12,7 +12,7 @@ public class Customs
         /// <summary>
         /// The type of contents in this shipment. This may impact import duties or customs treatment.
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public PackageContents Contents { get; set; }
 
         /// <summary>

diff --git a/ShipEngine/Models/Dto/Common/ShipmentItem.cs b/ShipEngine/Models/Dto/Common/ShipmentItem.cs
@@ -51,7 +51,7 @@ public class ShipmentItem
         /// <summary>
         /// The order sources that are supported by ShipEngine
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public OrderSourceCode? OrderSourceCode { get; set; }
     }
 }
diff --git a/ShipEngine/Models/Dto/CreateLabelFromRate/Params.cs b/ShipEngine/Models/Dto/CreateLabelFromRate/Params.cs
@@ -23,13 +23,13 @@ public class Params
         /// <summary>
         /// The layout (size) that you want the label to be in.
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public LabelLayout LabelLayout { get; set; }
 
         /// <summary>
         /// The file format that you want the label to be in.
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public LabelFormat LabelFormat { get; set; }
 
         /// <summary>
@@ -41,7 +41,7 @@ public class Params
         /// <summary>
         /// The display format that the label should be shown in.
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public DisplayScheme DisplayScheme { get; set; }
     }
 }
diff --git a/ShipEngine/Models/Dto/CreateLabelFromShipmentDetails/Params.cs b/ShipEngine/Models/Dto/CreateLabelFromShipmentDetails/Params.cs
@@ -30,7 +30,7 @@ public class Params
         /// <summary>
         /// The label charge event.
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public ChargeEvent? ChargeEvent { get; set; }
 
         /// <summary>
@@ -155,19 +155,19 @@ public class Shipment
         /// <summary>
         /// Indicates if the package will be picked up or dropped off by the carrier
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public OriginType OriginType { get; set; }
 
         /// <summary>
         /// The insurance provider to use for any insured packages in the shipment
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public InsuranceProvider InsuranceProvider { get; set; }
 
         /// <summary>
         /// The order sources that are supported by ShipEngine
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public OrderSourceCode? OrderSourceCode { get; set; }
 
         /// <summary>
@@ -222,13 +222,13 @@ public class InternationalShipmentOptions
         /// <summary>
         /// The type of contents in this shipment. This may impact import duties or customs treatment.
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public PackageContents Contents { get; set; }
 
         /// <summary>
         /// Indicates what to do if a package is unable to be delivered.
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public NonDelivery NonDelivery { get; set; }
 
         /// <summary>

diff --git a/ShipEngine/Models/Dto/GetRatesFromShipmentDetails/Params.cs b/ShipEngine/Models/Dto/GetRatesFromShipmentDetails/Params.cs
@@ -100,7 +100,7 @@ public class Shipment
         /// <summary>
         /// The type of delivery confirmation that is required for this shipment.
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public DeliveryConfirmation Confirmation { get; set; }
 
         /// <summary>
@@ -121,7 +121,7 @@ public class Shipment
         /// <summary>
         /// The insurance provider to use for any insured packages in the shipment.
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public InsuranceProvider InsuranceProvider { get; set; }
 
         /// <summary>
@@ -132,7 +132,7 @@ public class Shipment
         /// <summary>
         /// The order sources that are supported by ShipEngine
         /// </summary>
-        [JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumMemberConverter))]
         public OrderSourceCode OrderSourceCode { get; set; }
 
         /// <summary>

diff --git a/ShipEngine/ShipEngine.csproj b/ShipEngine/ShipEngine.csproj
@@ -4,7 +4,7 @@
 		<PackageId>ShipEngine</PackageId>
 		<PackageTags>sdk;rest;api;shipping;rates;label;tracking;cost;address;validation;normalization;fedex;ups;usps;</PackageTags>
 
-		<Version>2.0.0</Version>
+		<Version>2.0.1</Version>
 		<Authors>ShipEngine</Authors>
 		<Company>ShipEngine</Company>
 		<Summary>The official ShipEngine C# SDK for .NET</Summary>