Skip to content

Commit ec4287b

Browse files
abuzuhriabuzuhri
authored
Merge pull request #494 from Xriuk/main
Order warnings cleanup + CancellationToken initial implementation
2 parents 474c288 + 5559498 commit ec4287b

File tree

5 files changed

+102
-87
lines changed

5 files changed

+102
-87
lines changed

‎Source/FikaAmazonAPI/AmazonSpApiSDK/Models/Orders/Order.cs

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,11 @@ public Order() { }
241241
/// <param name="sellerDisplayName">The seller’s friendly name registered in the marketplace..</param>
242242
/// <param name="shippingAddress">shippingAddress.</param>
243243
/// <param name="buyerInfo">buyerInfo.</param>
244-
public Order(string amazonOrderId = default(string), string sellerOrderId = default(string), string purchaseDate = default(string), string lastUpdateDate = default(string), OrderStatusEnum orderStatus = default(OrderStatusEnum), FulfillmentChannelEnum? fulfillmentChannel = default(FulfillmentChannelEnum?), string salesChannel = default(string), string orderChannel = default(string), string shipServiceLevel = default(string), Money orderTotal = default(Money), int? numberOfItemsShipped = default(int?), int? numberOfItemsUnshipped = default(int?), PaymentExecutionDetailItemList paymentExecutionDetail = default(PaymentExecutionDetailItemList), PaymentMethodEnum? paymentMethod = default(PaymentMethodEnum?), PaymentMethodDetailItemList paymentMethodDetails = default(PaymentMethodDetailItemList), string marketplaceId = default(string), string shipmentServiceLevelCategory = default(string), string easyShipShipmentStatus = default(string), string cbaDisplayableShippingLabel = default(string), OrderTypeEnum? orderType = default(OrderTypeEnum?), string earliestShipDate = default(string), string latestShipDate = default(string), string earliestDeliveryDate = default(string), string latestDeliveryDate = default(string), bool? isBusinessOrder = default(bool?), bool? isPrime = default(bool?), bool? isPremiumOrder = default(bool?), bool? isGlobalExpressEnabled = default(bool?), string replacedOrderId = default(string), bool? isReplacementOrder = default(bool?), string promiseResponseDueDate = default(string), bool? isEstimatedShipDateSet = default(bool?), bool? isSoldByAB = default(bool?), bool? isIBA = default(bool?), Address defaultShipFromLocationAddress = default(Address), FulfillmentInstruction fulfillmentInstruction = default(FulfillmentInstruction), bool? isISPU = default(bool?), MarketplaceTaxInfo marketplaceTaxInfo = default(MarketplaceTaxInfo), string sellerDisplayName = default(string), Address shippingAddress = default(Address), BuyerInfo buyerInfo = default(BuyerInfo))
244+
public Order(string amazonOrderId = default(string), string sellerOrderId = default(string), string purchaseDate = default(string), string lastUpdateDate = default(string), OrderStatusEnum? orderStatus = default(OrderStatusEnum?), FulfillmentChannelEnum? fulfillmentChannel = default(FulfillmentChannelEnum?), string salesChannel = default(string), string orderChannel = default(string), string shipServiceLevel = default(string), Money orderTotal = default(Money), int? numberOfItemsShipped = default(int?), int? numberOfItemsUnshipped = default(int?), PaymentExecutionDetailItemList paymentExecutionDetail = default(PaymentExecutionDetailItemList), PaymentMethodEnum? paymentMethod = default(PaymentMethodEnum?), PaymentMethodDetailItemList paymentMethodDetails = default(PaymentMethodDetailItemList), string marketplaceId = default(string), string shipmentServiceLevelCategory = default(string), string easyShipShipmentStatus = default(string), string cbaDisplayableShippingLabel = default(string), OrderTypeEnum? orderType = default(OrderTypeEnum?), string earliestShipDate = default(string), string latestShipDate = default(string), string earliestDeliveryDate = default(string), string latestDeliveryDate = default(string), bool? isBusinessOrder = default(bool?), bool? isPrime = default(bool?), bool? isPremiumOrder = default(bool?), bool? isGlobalExpressEnabled = default(bool?), string replacedOrderId = default(string), bool? isReplacementOrder = default(bool?), string promiseResponseDueDate = default(string), bool? isEstimatedShipDateSet = default(bool?), bool? isSoldByAB = default(bool?), bool? isIBA = default(bool?), Address defaultShipFromLocationAddress = default(Address), FulfillmentInstruction fulfillmentInstruction = default(FulfillmentInstruction), bool? isISPU = default(bool?), MarketplaceTaxInfo marketplaceTaxInfo = default(MarketplaceTaxInfo), string sellerDisplayName = default(string), Address shippingAddress = default(Address), BuyerInfo buyerInfo = default(BuyerInfo))
245245
{
246-
// to ensure "amazonOrderId" is required (not null)
247-
if (amazonOrderId == null)
246+
#pragma warning disable 0618
247+
// to ensure "amazonOrderId" is required (not null)
248+
if (amazonOrderId == null)
248249
{
249250
throw new InvalidDataException("amazonOrderId is a required property for Order and cannot be null");
250251
}
@@ -277,7 +278,7 @@ public Order() { }
277278
}
278279
else
279280
{
280-
this.OrderStatus = orderStatus;
281+
this.OrderStatus = orderStatus.Value;
281282
}
282283
this.SellerOrderId = sellerOrderId;
283284
this.FulfillmentChannel = fulfillmentChannel;
@@ -316,13 +317,14 @@ public Order() { }
316317
this.SellerDisplayName = sellerDisplayName;
317318
this.ShippingAddress = shippingAddress;
318319
this.BuyerInfo = buyerInfo;
319-
}
320+
#pragma warning restore 0618
321+
}
320322

321-
/// <summary>
322-
/// An Amazon-defined order identifier, in 3-7-7 format.
323-
/// </summary>
324-
/// <value>An Amazon-defined order identifier, in 3-7-7 format.</value>
325-
[DataMember(Name = "AmazonOrderId", EmitDefaultValue = false)]
323+
/// <summary>
324+
/// An Amazon-defined order identifier, in 3-7-7 format.
325+
/// </summary>
326+
/// <value>An Amazon-defined order identifier, in 3-7-7 format.</value>
327+
[DataMember(Name = "AmazonOrderId", EmitDefaultValue = false)]
326328
public string AmazonOrderId { get; set; }
327329

328330
/// <summary>
@@ -634,7 +636,8 @@ public DateTime? PromiseResponseDueDateTime {
634636
/// <returns>String presentation of the object</returns>
635637
public override string ToString()
636638
{
637-
var sb = new StringBuilder();
639+
#pragma warning disable 0618
640+
var sb = new StringBuilder();
638641
sb.Append("class Order {\n");
639642
sb.Append(" AmazonOrderId: ").Append(AmazonOrderId).Append("\n");
640643
sb.Append(" SellerOrderId: ").Append(SellerOrderId).Append("\n");
@@ -679,13 +682,14 @@ public override string ToString()
679682
sb.Append(" BuyerInfo: ").Append(BuyerInfo).Append("\n");
680683
sb.Append("}\n");
681684
return sb.ToString();
682-
}
685+
#pragma warning restore 0618
686+
}
683687

684-
/// <summary>
685-
/// Returns the JSON string presentation of the object
686-
/// </summary>
687-
/// <returns>JSON string presentation of the object</returns>
688-
public virtual string ToJson()
688+
/// <summary>
689+
/// Returns the JSON string presentation of the object
690+
/// </summary>
691+
/// <returns>JSON string presentation of the object</returns>
692+
public virtual string ToJson()
689693
{
690694
return JsonConvert.SerializeObject(this, Formatting.Indented);
691695
}
@@ -707,7 +711,8 @@ public override bool Equals(object input)
707711
/// <returns>Boolean</returns>
708712
public bool Equals(Order input)
709713
{
710-
if (input == null)
714+
#pragma warning disable 0618
715+
if (input == null)
711716
return false;
712717

713718
return
@@ -733,8 +738,7 @@ public bool Equals(Order input)
733738
) &&
734739
(
735740
this.OrderStatus == input.OrderStatus ||
736-
(this.OrderStatus != null &&
737-
this.OrderStatus.Equals(input.OrderStatus))
741+
this.OrderStatus.Equals(input.OrderStatus)
738742
) &&
739743
(
740744
this.FulfillmentChannel == input.FulfillmentChannel ||
@@ -916,16 +920,18 @@ public bool Equals(Order input)
916920
(this.BuyerInfo != null &&
917921
this.BuyerInfo.Equals(input.BuyerInfo))
918922
);
919-
}
923+
#pragma warning restore 0618
924+
}
920925

921-
/// <summary>
922-
/// Gets the hash code
923-
/// </summary>
924-
/// <returns>Hash code</returns>
925-
public override int GetHashCode()
926+
/// <summary>
927+
/// Gets the hash code
928+
/// </summary>
929+
/// <returns>Hash code</returns>
930+
public override int GetHashCode()
926931
{
927-
unchecked // Overflow is fine, just wrap
928-
{
932+
#pragma warning disable 0618
933+
unchecked // Overflow is fine, just wrap
934+
{
929935
int hashCode = 41;
930936
if (this.AmazonOrderId != null)
931937
hashCode = hashCode * 59 + this.AmazonOrderId.GetHashCode();
@@ -935,8 +941,7 @@ public override int GetHashCode()
935941
hashCode = hashCode * 59 + this.PurchaseDate.GetHashCode();
936942
if (this.LastUpdateDate != null)
937943
hashCode = hashCode * 59 + this.LastUpdateDate.GetHashCode();
938-
if (this.OrderStatus != null)
939-
hashCode = hashCode * 59 + this.OrderStatus.GetHashCode();
944+
hashCode = hashCode * 59 + this.OrderStatus.GetHashCode();
940945
if (this.FulfillmentChannel != null)
941946
hashCode = hashCode * 59 + this.FulfillmentChannel.GetHashCode();
942947
if (this.SalesChannel != null)
@@ -1011,14 +1016,15 @@ public override int GetHashCode()
10111016
hashCode = hashCode * 59 + this.BuyerInfo.GetHashCode();
10121017
return hashCode;
10131018
}
1014-
}
1019+
#pragma warning restore 0618
1020+
}
10151021

1016-
/// <summary>
1017-
/// To validate all properties of the instance
1018-
/// </summary>
1019-
/// <param name="validationContext">Validation context</param>
1020-
/// <returns>Validation Result</returns>
1021-
IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
1022+
/// <summary>
1023+
/// To validate all properties of the instance
1024+
/// </summary>
1025+
/// <param name="validationContext">Validation context</param>
1026+
/// <returns>Validation Result</returns>
1027+
IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
10221028
{
10231029
yield break;
10241030
}

‎Source/FikaAmazonAPI/AmazonSpApiSDK/Runtime/LWAClient.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using RestSharp;
44
using System;
55
using System.IO;
6+
using System.Threading;
67
using System.Threading.Tasks;
78

89
namespace FikaAmazonAPI.AmazonSpApiSDK.Runtime
@@ -31,7 +32,7 @@ public LWAClient(LWAAuthorizationCredentials lwaAuthorizationCredentials)
3132
/// </summary>
3233
/// <param name="lwaAccessTokenRequestMeta">LWA AccessTokenRequest metadata</param>
3334
/// <returns>LWA Access Token</returns>
34-
public virtual async Task<TokenResponse> GetAccessTokenAsync()
35+
public virtual async Task<TokenResponse> GetAccessTokenAsync(CancellationToken cancellationToken = default)
3536
{
3637
LWAAccessTokenRequestMeta lwaAccessTokenRequestMeta = LWAAccessTokenRequestMetaBuilder.Build(LWAAuthorizationCredentials);
3738
var accessTokenRequest = new RestRequest(LWAAuthorizationCredentials.Endpoint.AbsolutePath, RestSharp.Method.Post);
@@ -43,7 +44,7 @@ public virtual async Task<TokenResponse> GetAccessTokenAsync()
4344

4445
try
4546
{
46-
var response = await RestClient.ExecuteAsync(accessTokenRequest).ConfigureAwait(false);
47+
var response = await RestClient.ExecuteAsync(accessTokenRequest, cancellationToken).ConfigureAwait(false);
4748

4849
if (!IsSuccessful(response))
4950
{

0 commit comments

Comments
 (0)