From e0c5994660c2c9824f430312242c8304ba4ec3f7 Mon Sep 17 00:00:00 2001
From: Ingenico ePayments <github@epay.ingenico.com>
Date: Thu, 3 Sep 2020 16:32:08 +0200
Subject: [PATCH] Release 6.15.0.

---
 pom.xml                                       |  2 +-
 .../CreateHostedCheckoutRequest.java          |  4 ++--
 ...mentMethodSpecificInputHostedCheckout.java |  4 ++--
 .../definitions/AdditionalOrderInput.java     |  8 +++----
 .../definitions/DecryptedPaymentData.java     | 22 +++++++++++++++++++
 .../payment/definitions/Installments.java     |  6 ++---
 .../gateway/sdk/java/MetaDataProvider.java    |  2 +-
 .../sdk/java/webhooks/WebhooksHelperTest.java | 16 ++++++++++++--
 8 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 187ec2142..7437ce610 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.ingenico.connect.gateway</groupId>
 	<artifactId>connect-sdk-java</artifactId>
-	<version>6.14.0</version>
+	<version>6.15.0</version>
 	<packaging>jar</packaging>
 
 	<name>connect-sdk-java</name>
diff --git a/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/hostedcheckout/CreateHostedCheckoutRequest.java b/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/hostedcheckout/CreateHostedCheckoutRequest.java
index 1989d570f..5e7723606 100644
--- a/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/hostedcheckout/CreateHostedCheckoutRequest.java
+++ b/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/hostedcheckout/CreateHostedCheckoutRequest.java
@@ -139,14 +139,14 @@ public void setMerchant(Merchant value) {
 	}
 
 	/**
-	 * Object containing reference data for Google Pay.
+	 * Object containing reference data for Google Pay (paymentProductId 320) and Apple Pay (paymentProductID 302).
 	 */
 	public MobilePaymentMethodSpecificInputHostedCheckout getMobilePaymentMethodSpecificInput() {
 		return mobilePaymentMethodSpecificInput;
 	}
 
 	/**
-	 * Object containing reference data for Google Pay.
+	 * Object containing reference data for Google Pay (paymentProductId 320) and Apple Pay (paymentProductID 302).
 	 */
 	public void setMobilePaymentMethodSpecificInput(MobilePaymentMethodSpecificInputHostedCheckout value) {
 		this.mobilePaymentMethodSpecificInput = value;
diff --git a/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/hostedcheckout/definitions/MobilePaymentMethodSpecificInputHostedCheckout.java b/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/hostedcheckout/definitions/MobilePaymentMethodSpecificInputHostedCheckout.java
index 7968e96ed..9a696463a 100644
--- a/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/hostedcheckout/definitions/MobilePaymentMethodSpecificInputHostedCheckout.java
+++ b/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/hostedcheckout/definitions/MobilePaymentMethodSpecificInputHostedCheckout.java
@@ -27,14 +27,14 @@ public void setPaymentProduct302SpecificInput(MobilePaymentProduct302SpecificInp
 	}
 
 	/**
-	 * Object containing information specific to Google Pay
+	 * Object containing information specific to Google Pay (paymentProductId 320)
 	 */
 	public MobilePaymentProduct320SpecificInputHostedCheckout getPaymentProduct320SpecificInput() {
 		return paymentProduct320SpecificInput;
 	}
 
 	/**
-	 * Object containing information specific to Google Pay
+	 * Object containing information specific to Google Pay (paymentProductId 320)
 	 */
 	public void setPaymentProduct320SpecificInput(MobilePaymentProduct320SpecificInputHostedCheckout value) {
 		this.paymentProduct320SpecificInput = value;
diff --git a/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/payment/definitions/AdditionalOrderInput.java b/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/payment/definitions/AdditionalOrderInput.java
index 5085e7353..de1e87f90 100644
--- a/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/payment/definitions/AdditionalOrderInput.java
+++ b/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/payment/definitions/AdditionalOrderInput.java
@@ -38,14 +38,14 @@ public void setAirlineData(AirlineData value) {
 	}
 
 	/**
-	 * Object containing data related to installments.
+	 * Object containing data related to installments which can be used for card payments and only with some acquirers. In case you send in the details of this object, only the combination of card products and acquirers that do support installments will be shown on the MyCheckout hosted payment pages.
 	 */
 	public Installments getInstallments() {
 		return installments;
 	}
 
 	/**
-	 * Object containing data related to installments.
+	 * Object containing data related to installments which can be used for card payments and only with some acquirers. In case you send in the details of this object, only the combination of card products and acquirers that do support installments will be shown on the MyCheckout hosted payment pages.
 	 */
 	public void setInstallments(Installments value) {
 		this.installments = value;
@@ -86,7 +86,7 @@ public void setLoanRecipient(LoanRecipient value) {
 	}
 
 	/**
-	 * The number of installments
+	 * The number of installments in which this transaction will be paid, which can be used for card payments. Only used with some acquirers. In case you send in the details of this object, only the combination of card products and acquirers that do support installments will be shown on the MyCheckout hosted payment pages.
 	 *
 	 * @deprecated Use installments.numberOfInstallments instead
 	 */
@@ -96,7 +96,7 @@ public Long getNumberOfInstallments() {
 	}
 
 	/**
-	 * The number of installments
+	 * The number of installments in which this transaction will be paid, which can be used for card payments. Only used with some acquirers. In case you send in the details of this object, only the combination of card products and acquirers that do support installments will be shown on the MyCheckout hosted payment pages.
 	 *
 	 * @deprecated Use installments.numberOfInstallments instead
 	 */
diff --git a/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/payment/definitions/DecryptedPaymentData.java b/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/payment/definitions/DecryptedPaymentData.java
index 777a6bd6b..5d67b53f5 100644
--- a/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/payment/definitions/DecryptedPaymentData.java
+++ b/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/payment/definitions/DecryptedPaymentData.java
@@ -6,6 +6,8 @@
 
 public class DecryptedPaymentData {
 
+	private String authMethod = null;
+
 	private String cardholderName = null;
 
 	private String cryptogram = null;
@@ -20,6 +22,26 @@ public class DecryptedPaymentData {
 
 	private String paymentMethod = null;
 
+	/**
+	 * The type of payment credential which the customer used.
+	 * <ul class="paragraph-width">
+	 * <li>For Google Pay, maps to the paymentMethodDetails.authMethod property in the encrypted payment data.
+	 * </ul>.
+	 */
+	public String getAuthMethod() {
+		return authMethod;
+	}
+
+	/**
+	 * The type of payment credential which the customer used.
+	 * <ul class="paragraph-width">
+	 * <li>For Google Pay, maps to the paymentMethodDetails.authMethod property in the encrypted payment data.
+	 * </ul>.
+	 */
+	public void setAuthMethod(String value) {
+		this.authMethod = value;
+	}
+
 	/**
 	 * Card holder's name on the card.
 	 * <ul class="paragraph-width">
diff --git a/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/payment/definitions/Installments.java b/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/payment/definitions/Installments.java
index 19557674e..02ebf83b5 100644
--- a/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/payment/definitions/Installments.java
+++ b/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/payment/definitions/Installments.java
@@ -7,7 +7,7 @@
 import com.ingenico.connect.gateway.sdk.java.domain.definitions.AmountOfMoney;
 
 /**
- * Object containing data related to installments.
+ * Object containing data related to installments which can be used for card payments and only with some acquirers. In case you send in the details of this object, only the combination of card products and acquirers that do support installments will be shown on the MyCheckout hosted payment pages.
  */
 public class Installments {
 
@@ -76,14 +76,14 @@ public void setInterestRate(String value) {
 	}
 
 	/**
-	 * The number of installments in which this transaction will be paid.
+	 * The number of installments in which this transaction will be paid, which can be used for card payments. Only used with some acquirers. In case you send in the details of this object, only the combination of card products and acquirers that do support installments will be shown on the MyCheckout hosted payment pages.
 	 */
 	public Long getNumberOfInstallments() {
 		return numberOfInstallments;
 	}
 
 	/**
-	 * The number of installments in which this transaction will be paid.
+	 * The number of installments in which this transaction will be paid, which can be used for card payments. Only used with some acquirers. In case you send in the details of this object, only the combination of card products and acquirers that do support installments will be shown on the MyCheckout hosted payment pages.
 	 */
 	public void setNumberOfInstallments(Long value) {
 		this.numberOfInstallments = value;
diff --git a/src/main/java/com/ingenico/connect/gateway/sdk/java/MetaDataProvider.java b/src/main/java/com/ingenico/connect/gateway/sdk/java/MetaDataProvider.java
index fe0cfd5a5..94dd65832 100644
--- a/src/main/java/com/ingenico/connect/gateway/sdk/java/MetaDataProvider.java
+++ b/src/main/java/com/ingenico/connect/gateway/sdk/java/MetaDataProvider.java
@@ -19,7 +19,7 @@
  */
 public class MetaDataProvider {
 
-	private static final String SDK_VERSION = "6.14.0";
+	private static final String SDK_VERSION = "6.15.0";
 
 	private static final String SERVER_META_INFO_HEADER = "X-GCS-ServerMetaInfo";
 	static final Set<String> PROHIBITED_HEADERS;
diff --git a/src/test/java/com/ingenico/connect/gateway/sdk/java/webhooks/WebhooksHelperTest.java b/src/test/java/com/ingenico/connect/gateway/sdk/java/webhooks/WebhooksHelperTest.java
index 7b4b87495..0f2a11628 100644
--- a/src/test/java/com/ingenico/connect/gateway/sdk/java/webhooks/WebhooksHelperTest.java
+++ b/src/test/java/com/ingenico/connect/gateway/sdk/java/webhooks/WebhooksHelperTest.java
@@ -316,8 +316,20 @@ public void testUnmarshalStringInvalidSignature() throws IOException {
 
 	private byte[] readResource(String resource) throws IOException {
 
-		// the resources may contain \r but the body from which the signature was created doesn't
-		// strip those out while reading
+		/*
+		 * The resources may contain \r on Windows machines, but the body from which the signature was created does not.
+		 * Strip those out while reading.
+		 *
+		 * Note that this should not be done when creating webhooks endpoints. Signatures are created for bodies as they
+		 * are sent. If such bodies contain \r then stripping out any \r will lead to a signature mismatch. Instead,
+		 * it's best to read the body in chunks. For instance:
+		 *
+		 *     byte[] buffer = new byte[1024];
+		 *     int len;
+		 *     while ((len = input.read(buffer)) != -1) {
+		 *         output.write(buffer, 0, len);
+		 *     }
+		 */
 
 		ByteArrayOutputStream output = new ByteArrayOutputStream();
 		InputStream input = new BufferedInputStream(getClass().getResourceAsStream(resource));