Amazon Pay Java SDK 3.6.2

Author: Harshika Agarwal

CHANGES.txt

@@ -1,3 +1,6 @@
+Version 3.6.2 - August 2019
+Fix SetBillingAgreementDetails NPE for US and JP regions.
+
 Version 3.6.1 - August 2019
 Strong Customer Authentication (SCA) implementation bug fix.
 

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

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

pom.xml

@@ -419,10 +419,12 @@ public String getPostURL(SetBillingAgreementDetailsRequest request) {
             parameters.put(ServiceConstants.BILLING_AGREEMENT_SELLER_CUSTOM_INFORMATION, request.getCustomInformation());
         if (request.getBillingAgreementType() != null)
             parameters.put(ServiceConstants.BILLING_AGREEMENT_TYPE, request.getBillingAgreementType().toString());
-        if (request.getSubscriptionAmount().getCurrencyCode() != null)
-            parameters.put(ServiceConstants.BILLING_AGREEMENT_SUBSCRIPTION_AMOUNT_CURRENCY_CODE, request.getSubscriptionAmount().getCurrencyCode());
-        if (request.getSubscriptionAmount().getAmount() != null)
-            parameters.put(ServiceConstants.BILLING_AGREEMENT_SUBSCRIPTION_AMOUNT_AMOUNT, request.getSubscriptionAmount().getAmount());
+        if (request.getSubscriptionAmount() != null) {
+            if (request.getSubscriptionAmount().getCurrencyCode() != null)
+                parameters.put(ServiceConstants.BILLING_AGREEMENT_SUBSCRIPTION_AMOUNT_CURRENCY_CODE, request.getSubscriptionAmount().getCurrencyCode());
+            if (request.getSubscriptionAmount().getAmount() != null)
+                parameters.put(ServiceConstants.BILLING_AGREEMENT_SUBSCRIPTION_AMOUNT_AMOUNT, request.getSubscriptionAmount().getAmount());
+        }
         addClientParameters(parameters, request);
 
         return Util.convertParameterMapToString(parameters);

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

@@ -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.1";
+    public static final String APPLICATION_LIBRARY_VERSION = "3.6.2";
     public static final String GITHUB_SDK_NAME = "amazon-pay-sdk-java";
 
     // Exponential backoff wait times (milliseconds) for retry operations