Merge remote-tracking branch 'github/master' into github_master

braintree · Apr 5, 2021 · dd2a10e · dd2a10e
2 parents c198d01 + 3233f98
commit dd2a10e
Show file tree

Hide file tree

Showing 35 changed files with 366 additions and 1,315 deletions.
diff --git a/src/Braintree/BraintreeGateway.cs b/src/Braintree/BraintreeGateway.cs
@@ -58,44 +58,44 @@ public class BraintreeGateway : IBraintreeGateway
     {
         public virtual Environment Environment
         {
-            get { return Configuration.Environment; }
-            set { Configuration.Environment = value; }
+            get => Configuration.Environment;
+            set => Configuration.Environment = value;
         }
 
         public virtual string MerchantId
         {
-            get { return Configuration.MerchantId; }
-            set { Configuration.MerchantId = value; }
+            get => Configuration.MerchantId;
+            set => Configuration.MerchantId = value;
         }
 
         public virtual string PublicKey
         {
-            get { return Configuration.PublicKey; }
-            set { Configuration.PublicKey = value; }
+            get => Configuration.PublicKey;
+            set => Configuration.PublicKey = value;
         }
 
         public virtual string PrivateKey
         {
-            get { return Configuration.PrivateKey; }
-            set { Configuration.PrivateKey = value; }
+            get => Configuration.PrivateKey;
+            set => Configuration.PrivateKey = value;
         }
 
         public virtual string AccessToken
         {
-            get { return Configuration.AccessToken; }
-            set { Configuration.AccessToken = value; }
+            get => Configuration.AccessToken;
+            set => Configuration.AccessToken = value;
         }
 
         public virtual string ClientId
         {
-            get { return Configuration.ClientId; }
-            set { Configuration.ClientId = value; }
+            get => Configuration.ClientId;
+            set => Configuration.ClientId = value;
         }
 
         public virtual string ClientSecret
         {
-            get { return Configuration.ClientSecret; }
-            set { Configuration.ClientSecret = value; }
+            get => Configuration.ClientSecret;
+            set => Configuration.ClientSecret = value;
         }
 
         public Configuration Configuration { get; set; }
@@ -146,130 +146,55 @@ public BraintreeGateway(Configuration configuration)
             Service = new BraintreeService(Configuration);
         }
 
-        public virtual IClientTokenGateway ClientToken
-        {
-            get { return new ClientTokenGateway(this); }
-        }
+        public virtual IClientTokenGateway ClientToken => new ClientTokenGateway(this);
 
-        public virtual ICustomerGateway Customer
-        {
-            get { return new CustomerGateway(this); }
-        }
+        public virtual ICustomerGateway Customer => new CustomerGateway(this);
 
-        public virtual IAddressGateway Address
-        {
-            get { return new AddressGateway(this); }
-        }
+        public virtual IAddressGateway Address => new AddressGateway(this);
 
-        public virtual IAddOnGateway AddOn
-        {
-            get { return new AddOnGateway(this); }
-        }
+        public virtual IAddOnGateway AddOn => new AddOnGateway(this);
 
-        public virtual ICreditCardGateway CreditCard
-        {
-            get { return new CreditCardGateway(this); }
-        }
+        public virtual ICreditCardGateway CreditCard => new CreditCardGateway(this);
 
-        public virtual ICreditCardVerificationGateway CreditCardVerification
-        {
-            get { return new CreditCardVerificationGateway(this); }
-        }
+        public virtual ICreditCardVerificationGateway CreditCardVerification => new CreditCardVerificationGateway(this);
 
-        public virtual IUsBankAccountVerificationGateway UsBankAccountVerification
-        {
-            get { return new UsBankAccountVerificationGateway(this); }
-        }
+        public virtual IUsBankAccountVerificationGateway UsBankAccountVerification => new UsBankAccountVerificationGateway(this);
 
 
-        public virtual IDiscountGateway Discount
-        {
-            get { return new DiscountGateway(this); }
-        }
+        public virtual IDiscountGateway Discount => new DiscountGateway(this);
 
-        public virtual IDisputeGateway Dispute
-        {
-            get { return new DisputeGateway(this); }
-        }
+        public virtual IDisputeGateway Dispute => new DisputeGateway(this);
 
-        public virtual IDocumentUploadGateway DocumentUpload
-        {
-            get { return new DocumentUploadGateway(this); }
-        }
+        public virtual IDocumentUploadGateway DocumentUpload => new DocumentUploadGateway(this);
 
-        public virtual IMerchantAccountGateway MerchantAccount
-        {
-            get { return new MerchantAccountGateway(this); }
-        }
+        public virtual IMerchantAccountGateway MerchantAccount => new MerchantAccountGateway(this);
 
-        public virtual IOAuthGateway OAuth
-        {
-            get { return new OAuthGateway(this); }
-        }
+        public virtual IOAuthGateway OAuth => new OAuthGateway(this);
 
-        public virtual IMerchantGateway Merchant
-        {
-            get { return new MerchantGateway(this); }
-        }
+        public virtual IMerchantGateway Merchant => new MerchantGateway(this);
 
-        public virtual IPaymentMethodGateway PaymentMethod
-        {
-            get { return new PaymentMethodGateway(this); }
-        }
+        public virtual IPaymentMethodGateway PaymentMethod => new PaymentMethodGateway(this);
 
-        public virtual IPayPalAccountGateway PayPalAccount
-        {
-            get { return new PayPalAccountGateway(this); }
-        }
+        public virtual IPayPalAccountGateway PayPalAccount => new PayPalAccountGateway(this);
 
-        public virtual IPlanGateway Plan
-        {
-            get { return new PlanGateway(this); }
-        }
+        public virtual IPlanGateway Plan => new PlanGateway(this);
 
-        public virtual ISettlementBatchSummaryGateway SettlementBatchSummary
-        {
-            get { return new SettlementBatchSummaryGateway(this); }
-        }
+        public virtual ISettlementBatchSummaryGateway SettlementBatchSummary => new SettlementBatchSummaryGateway(this);
 
-        public virtual ISubscriptionGateway Subscription
-        {
-            get { return new SubscriptionGateway(this); }
-        }
+        public virtual ISubscriptionGateway Subscription => new SubscriptionGateway(this);
 
-        public virtual IThreeDSecureGateway ThreeDSecure
-        {
-            get { return new ThreeDSecureGateway(this); }
-        }
+        public virtual IThreeDSecureGateway ThreeDSecure => new ThreeDSecureGateway(this);
 
-        public virtual ITestTransactionGateway TestTransaction
-        {
-            get { return new TestTransactionGateway(this); }
-        }
+        public virtual ITestTransactionGateway TestTransaction => new TestTransactionGateway(this);
 
-        public virtual ITransactionGateway Transaction
-        {
-            get { return new TransactionGateway(this); }
-        }
+        public virtual ITransactionGateway Transaction => new TransactionGateway(this);
 
-        public virtual ITransactionLineItemGateway TransactionLineItem
-        {
-            get { return new TransactionLineItemGateway(this); }
-        }
+        public virtual ITransactionLineItemGateway TransactionLineItem => new TransactionLineItemGateway(this);
 
-        public virtual IWebhookNotificationGateway WebhookNotification
-        {
-            get { return new WebhookNotificationGateway(this); }
-        }
+        public virtual IWebhookNotificationGateway WebhookNotification => new WebhookNotificationGateway(this);
 
-        public virtual IWebhookTestingGateway WebhookTesting
-        {
-            get { return new WebhookTestingGateway(this); }
-        }
+        public virtual IWebhookTestingGateway WebhookTesting => new WebhookTestingGateway(this);
 
-        public virtual IPaymentMethodNonceGateway PaymentMethodNonce
-        {
-            get { return new PaymentMethodNonceGateway(this); }
-        }
+        public virtual IPaymentMethodNonceGateway PaymentMethodNonce => new PaymentMethodNonceGateway(this);
     }
 }
diff --git a/src/Braintree/Configuration.cs b/src/Braintree/Configuration.cs
@@ -16,9 +16,7 @@ public class Configuration
     {
         private Environment _Environment;
         public Environment Environment {
-            get {
-                return this._Environment;
-            }
+            get => this._Environment;
             set {
                 if (this.Environment != null && this.AccessToken != null && this.Environment != value) {
                     throw new ConfigurationException("AccessToken Environment does not match Environment passed in Config");
@@ -28,9 +26,7 @@ public Environment Environment {
         }
         private string _AccessToken;
         public string AccessToken {
-            get {
-                return this._AccessToken;
-            }
+            get => this._AccessToken;
             set {
                 CredentialsParser parser = new CredentialsParser(value);
                 if (this.Environment != null && parser.Environment != this.Environment) {
@@ -56,8 +52,8 @@ public string AccessToken {
         private int timeout;
         public int Timeout
         {
-            get { return timeout == 0 ? 60000 : timeout; }
-            set { timeout = value; }
+            get => timeout == 0 ? 60000 : timeout;
+            set => timeout = value;
         }
 
         public Configuration()
@@ -112,15 +108,9 @@ public Configuration(string environment, string merchantId, string publicKey, st
         {
         }
 
-        public bool IsClientCredentials
-        {
-            get { return ClientId != null; }
-        }
+        public bool IsClientCredentials => ClientId != null;
 
-        public bool IsAccessToken
-        {
-            get { return AccessToken != null; }
-        }
+        public bool IsAccessToken => AccessToken != null;
 
         public void AssertHasClientCredentials()
         {

diff --git a/src/Braintree/ConnectedMerchantPayPalStatusChanged.cs b/src/Braintree/ConnectedMerchantPayPalStatusChanged.cs
@@ -5,9 +5,7 @@ namespace Braintree
     public class ConnectedMerchantPayPalStatusChanged
     {
         public virtual string MerchantPublicId { get; private set; }
-        public virtual string MerchantId {
-            get { return MerchantPublicId; }
-        }
+        public virtual string MerchantId => MerchantPublicId;
         public virtual string OAuthApplicationClientId { get; private set; }
         public virtual string Action { get; private set; }
 

diff --git a/src/Braintree/ConnectedMerchantStatusTransitioned.cs b/src/Braintree/ConnectedMerchantStatusTransitioned.cs
@@ -5,9 +5,7 @@ namespace Braintree
     public class ConnectedMerchantStatusTransitioned
     {
         public virtual string MerchantPublicId { get; private set; }
-        public virtual string MerchantId {
-            get { return MerchantPublicId; }
-        }
+        public virtual string MerchantId => MerchantPublicId;
         public virtual string OAuthApplicationClientId { get; private set; }
         public virtual string Status { get; private set; }
 

diff --git a/src/Braintree/CreditCard.cs b/src/Braintree/CreditCard.cs
@@ -182,24 +182,15 @@ public virtual string ProductId
 
         public virtual string ExpirationDate
         {
-            get
-            {
-                return ExpirationMonth + "/" + ExpirationYear;
-            }
+            get => ExpirationMonth + "/" + ExpirationYear;
             protected set
             {
                 ExpirationMonth = value.Split('/')[0];
                 ExpirationYear = value.Split('/')[1];
             }
         }
 
-        public string MaskedNumber
-        {
-            get
-            {
-                return string.Format("{0}******{1}", Bin, LastFour);
-            }
-        }
+        public string MaskedNumber => string.Format("{0}******{1}", Bin, LastFour);
 
         protected internal CreditCard(NodeWrapper node, IBraintreeGateway gateway)
         {

diff --git a/src/Braintree/CreditCardVerificationGateway.cs b/src/Braintree/CreditCardVerificationGateway.cs
@@ -45,18 +45,16 @@ public virtual ResourceCollection<CreditCardVerification> Search(CreditCardVerif
         {
             var response = new NodeWrapper(service.Post(service.MerchantPath() + "/verifications/advanced_search_ids", query));
 
-            return new ResourceCollection<CreditCardVerification>(response, delegate(string[] ids) {
-                return FetchCreditCardVerifications(query, ids);
-            });
+            return new ResourceCollection<CreditCardVerification>(response,
+                ids => FetchCreditCardVerifications(query, ids));
         }
 
         public virtual async Task<ResourceCollection<CreditCardVerification>> SearchAsync(CreditCardVerificationSearchRequest query)
         {
             var response = new NodeWrapper(await service.PostAsync(service.MerchantPath() + "/verifications/advanced_search_ids", query).ConfigureAwait(false));
 
-            return new ResourceCollection<CreditCardVerification>(response, delegate(string[] ids) {
-                return FetchCreditCardVerifications(query, ids);
-            });
+            return new ResourceCollection<CreditCardVerification>(response,
+                ids => FetchCreditCardVerifications(query, ids));
         }
 
         private List<CreditCardVerification> FetchCreditCardVerifications(CreditCardVerificationSearchRequest query, string[] ids)