Amazon Pay Java SDK 3.6.3

Author: bjguillot

CHANGES.txt

@@ -1,12 +1,16 @@
+Version 3.6.3 - February 2020
+- Fix Refund operation so that the ProviderCreditList is handled properly
+- Add ProviderCreditList support to the AuthorizeOnBillingAgreement operation
+
 Version 3.6.2 - August 2019
-Fix SetBillingAgreementDetails NPE for US and JP regions.
+- Fix SetBillingAgreementDetails NPE for US and JP regions
 
 Version 3.6.1 - August 2019
-Strong Customer Authentication (SCA) implementation bug fix.
+- Strong Customer Authentication (SCA) implementation bug fix
 
 Version 3.6.0 - August 2019
-Added additional attributes (successUrl, failureUrl) to ConfirmBillingAgreement and (subscriptionAmount, billingAgreementType) to SetBillingAgreement Details.
-See Amazon Pay Strong Customer Authentication (SCA) Upgrade Integration Guide for more information.
+- Added additional attributes (successUrl, failureUrl) to ConfirmBillingAgreement and (subscriptionAmount, billingAgreementType) to SetBillingAgreement Details
+  See Amazon Pay Strong Customer Authentication (SCA) Upgrade Integration Guide for more information
 
 Version 3.5.1 - May 2019
 - PaymentAuthenticationStatus getter added for GetOrderReferenceDetails, SetOrderReferenceDetails, and SetOrderAttributes API calls

dist/amazon-pay-3.6.2.jar dist/amazon-pay-3.6.3.jardist/amazon-pay-3.6.2.jar renamed to dist/amazon-pay-3.6.3.jar

@@ -4,7 +4,7 @@
     <groupId>com.amazon.pay</groupId>
     <artifactId>amazon-pay-java-sdk</artifactId>
     <packaging>jar</packaging>
-    <version>3.6.2</version>
+    <version>3.6.3</version>
     <dependencies>
         <dependency>
             <groupId>commons-codec</groupId>

pom.xml

@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2016-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -14,8 +14,10 @@
  */
 package com.amazon.pay.request;
 
+import com.amazon.pay.response.model.ProviderCredit;
 import com.amazon.pay.types.CurrencyCode;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * For more information documentation, see
@@ -42,11 +44,11 @@ protected AuthorizeOnBillingAgreementRequest getThis() {
     private String platformId;
     private String sellerNote;
     private Boolean inheritShippingAddress;
-
     private String sellerOrderId;
     private String storeName;
     private String supplementaryData;
     private String customInformation;
+    private List<ProviderCredit> providerCredit;
 
     /**
      * Constructs request for AuthorizeOnBillingAgreement operation
@@ -373,6 +375,27 @@ public String getCustomInformation() {
         return customInformation;
     }
 
+    /**
+     * Applicable for third-party solution providers only.
+     *
+     * @return ProviderCredit associated with this operation
+     */
+    public List<ProviderCredit> getProviderCredit() {
+        return providerCredit;
+    }
+
+    /**
+     * Applicable for third-party solution providers only.
+     *
+     * @param providerCreditList associated with this operation
+     *
+     * @return Returns a reference to this object so that methods can be chained together.
+     */
+    public AuthorizeOnBillingAgreementRequest setProviderCredit(List<ProviderCredit> providerCreditList) {
+        this.providerCredit = providerCreditList;
+        return this;
+    }
+
     /**
      * Returns a string representation of this object; useful for testing and
      * debugging.
@@ -399,6 +422,7 @@ public String toString() {
                 + ", storeName=" + storeName
                 + ", supplementaryData=" + supplementaryData
                 + ", customInformation=" + customInformation
+                + ", providerCredit=" + providerCredit
                 + ", mwsAuthToken=" + getMwsAuthToken() + '}';
     }
 

src/com/amazon/pay/request/AuthorizeOnBillingAgreementRequest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2016-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -336,7 +336,7 @@ public  String getPostURL(RefundRequest request) {
             parameters.put(ServiceConstants.SOFT_DESCRIPTOR, request.getSoftDescriptor());
         }
         if (request.getProviderCredit() != null) {
-            addProviderCreditToParamMap(request.getProviderCredit(), parameters);
+            addProviderCreditReversalToParamMap(request.getProviderCredit(), parameters);
         }
         addClientParameters(parameters, request);
         return Util.convertParameterMapToString(parameters);
@@ -489,6 +489,8 @@ public String getPostURL(AuthorizeOnBillingAgreementRequest request) {
             parameters.put(ServiceConstants.BA_CUSTOM_INFORMATION, request.getCustomInformation());
         if (request.getInheritShippingAddress() != null)
             parameters.put(ServiceConstants.INHERIT_SHIPPING_ADDRESS, Boolean.toString(request.getInheritShippingAddress()));
+        if (request.getProviderCredit() != null)
+            addProviderCreditToParamMap(request.getProviderCredit(), parameters);
         addClientParameters(parameters, request);
         return Util.convertParameterMapToString(parameters);
     }
@@ -662,7 +664,7 @@ private void addProviderCreditToParamMap(List<ProviderCredit> providerCreditList
                     if (member.getProviderId() != null) {
                         parameters.put("ProviderCreditList" + "." + "member" + "."  + memberListIndex + "." + "ProviderId", member.getProviderId());
                     }
-                    Price creditAmount = member.getCreditAmount();
+                    final Price creditAmount = member.getCreditAmount();
                     if (creditAmount != null) {
                         parameters.put("ProviderCreditList" + "." + "member" + "."  + memberListIndex + "." + "CreditAmount" + "." + "Amount", creditAmount.getAmount());
                         parameters.put("ProviderCreditList" + "." + "member" + "."  + memberListIndex + "." + "CreditAmount" + "." + "CurrencyCode", creditAmount.getCurrencyCode());
@@ -673,4 +675,23 @@ private void addProviderCreditToParamMap(List<ProviderCredit> providerCreditList
         }
     }
 
+    private void addProviderCreditReversalToParamMap(List<ProviderCredit> providerCreditList, Map<String,String> parameters) {
+        if (providerCreditList != null) {
+            int memberListIndex = 1;
+            for (ProviderCredit member : providerCreditList) {
+                if (member != null) {
+                    if (member.getProviderId() != null) {
+                        parameters.put("ProviderCreditReversalList" + "." + "member" + "."  + memberListIndex + "." + "ProviderId", member.getProviderId());
+                    }
+                    final Price creditAmount = member.getCreditAmount();
+                    if (creditAmount != null) {
+                        parameters.put("ProviderCreditReversalList" + "." + "member" + "."  + memberListIndex + "." + "CreditReversalAmount" + "." + "Amount", creditAmount.getAmount());
+                        parameters.put("ProviderCreditReversalList" + "." + "member" + "."  + memberListIndex + "." + "CreditReversalAmount" + "." + "CurrencyCode", creditAmount.getCurrencyCode());
+                    }
+                    memberListIndex++;
+                }
+            }
+        }
+    }
+
 }

src/com/amazon/pay/request/RequestHelper.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2016-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -152,7 +152,7 @@ public class ServiceConstants {
     public static final String GET_MERCHANT_ACCOUNT_STATUS = "GetMerchantAccountStatus";
 
     // SDK version
-    public static final String APPLICATION_LIBRARY_VERSION = "3.6.2";
+    public static final String APPLICATION_LIBRARY_VERSION = "3.6.3";
     public static final String GITHUB_SDK_NAME = "amazon-pay-sdk-java";
 
     // Exponential backoff wait times (milliseconds) for retry operations