From 3e1b97ba87d802f8ebda24d10ca289f3ec7b7d12 Mon Sep 17 00:00:00 2001 From: Ingenico ePayments Date: Mon, 13 Feb 2017 12:08:47 +0100 Subject: [PATCH] Release 5.2.0. --- pom.xml | 79 ++++++++++++++++--- .../payments/CreatePaymentExample.java | 2 +- .../connect/gateway/sdk/it/SDKProxyTest.java | 1 - .../product/definitions/PaymentProduct.java | 10 +++ .../gateway/sdk/java/MetaDataProvider.java | 2 +- .../java/defaultimpl/DefaultConnection.java | 4 +- .../DefaultConnectionLoggerTest.java | 19 +++-- 7 files changed, 96 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 312315865..c4c959c39 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.ingenico.connect.gateway connect-sdk-java - 5.1.0 + 5.2.0 jar connect-sdk-java @@ -14,12 +14,12 @@ Ingenico ePayments - http://http://www.ingenico.com/epayments/ + https://www.ingenico.com/epayments/ - Ingenico ePayments License + MIT https://github.com/Ingenico-ePayments/connect-sdk-java/blob/master/LICENSE.txt @@ -29,14 +29,14 @@ Ingenico ePayments github@epay.ingenico.com Ingenico ePayments - http://http://www.ingenico.com/epayments/ + https://www.ingenico.com/epayments/ - git@github.com:Ingenico-ePayments/connect-sdk-java.git - git@github.com:Ingenico-ePayments/connect-sdk-java.git - git@github.com:Ingenico-ePayments/connect-sdk-java.git + scm:git:git@github.com:Ingenico-ePayments/connect-sdk-java.git + scm:git:git@github.com:Ingenico-ePayments/connect-sdk-java.git + https://github.com/Ingenico-ePayments/connect-sdk-java @@ -56,15 +56,49 @@ - + src/main/resources + + + ${basedir} false + META-INF LICENSE.txt - + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-antrun-plugin + [1.0,) + + run + + + + + + + + + + + + + org.apache.maven.plugins @@ -139,6 +173,10 @@ UTF-8 true + + + https://docs.oracle.com/javase/7/docs/api/ + ${project.name} @@ -155,6 +193,29 @@ + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + generate-sources + + run + + + + + + + + + + + + + + org.apache.maven.plugins maven-assembly-plugin diff --git a/src/examples/java/com/ingenico/connect/gateway/sdk/java/merchant/payments/CreatePaymentExample.java b/src/examples/java/com/ingenico/connect/gateway/sdk/java/merchant/payments/CreatePaymentExample.java index ff734392d..616088604 100644 --- a/src/examples/java/com/ingenico/connect/gateway/sdk/java/merchant/payments/CreatePaymentExample.java +++ b/src/examples/java/com/ingenico/connect/gateway/sdk/java/merchant/payments/CreatePaymentExample.java @@ -131,7 +131,7 @@ public void example() throws URISyntaxException, IOException { item2AmountOfMoney.setCurrencyCode("EUR"); LineItemInvoiceData item2InvoiceData = new LineItemInvoiceData(); - item2InvoiceData.setDescription("Asperin"); + item2InvoiceData.setDescription("Aspirin"); item2InvoiceData.setNrOfItems("12"); item2InvoiceData.setPricePerItem(40L); diff --git a/src/it/java/com/ingenico/connect/gateway/sdk/it/SDKProxyTest.java b/src/it/java/com/ingenico/connect/gateway/sdk/it/SDKProxyTest.java index bb68fab84..763562d47 100644 --- a/src/it/java/com/ingenico/connect/gateway/sdk/it/SDKProxyTest.java +++ b/src/it/java/com/ingenico/connect/gateway/sdk/it/SDKProxyTest.java @@ -42,7 +42,6 @@ public void test() throws URISyntaxException, IOException { try { ServicesClient services = client.merchant("9991").services(); - Assert.assertTrue(services instanceof ServicesClient); CommunicatorConfiguration configuration = getCommunicatorConfigurationWithProxy(); Assert.assertNotNull(configuration.getProxyConfiguration()); assertProxySet(services, configuration.getProxyConfiguration()); diff --git a/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/product/definitions/PaymentProduct.java b/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/product/definitions/PaymentProduct.java index e5c0f9120..f4453bf29 100644 --- a/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/product/definitions/PaymentProduct.java +++ b/src/main/generated/com/ingenico/connect/gateway/sdk/java/domain/product/definitions/PaymentProduct.java @@ -22,6 +22,8 @@ public class PaymentProduct { private Boolean autoTokenized = null; + private Boolean canBeIframed = null; + private PaymentProductDisplayHints displayHints = null; private List fields = null; @@ -72,6 +74,14 @@ public void setAutoTokenized(Boolean value) { this.autoTokenized = value; } + public Boolean getCanBeIframed() { + return canBeIframed; + } + + public void setCanBeIframed(Boolean value) { + this.canBeIframed = value; + } + public PaymentProductDisplayHints getDisplayHints() { return displayHints; } 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 aeab9b9b2..414d6a0a1 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 = "5.1.0"; + private static final String SDK_VERSION = "5.2.0"; private static final String SERVER_META_INFO_HEADER = "X-GCS-ServerMetaInfo"; static final Set PROHIBITED_HEADERS; diff --git a/src/main/java/com/ingenico/connect/gateway/sdk/java/defaultimpl/DefaultConnection.java b/src/main/java/com/ingenico/connect/gateway/sdk/java/defaultimpl/DefaultConnection.java index a2ce3aaa2..fa228d7cc 100644 --- a/src/main/java/com/ingenico/connect/gateway/sdk/java/defaultimpl/DefaultConnection.java +++ b/src/main/java/com/ingenico/connect/gateway/sdk/java/defaultimpl/DefaultConnection.java @@ -54,8 +54,8 @@ import org.apache.http.util.EntityUtils; import com.ingenico.connect.gateway.sdk.java.CommunicationException; -import com.ingenico.connect.gateway.sdk.java.Connection; import com.ingenico.connect.gateway.sdk.java.CommunicatorConfiguration; +import com.ingenico.connect.gateway.sdk.java.Connection; import com.ingenico.connect.gateway.sdk.java.PooledConnection; import com.ingenico.connect.gateway.sdk.java.ProxyConfiguration; import com.ingenico.connect.gateway.sdk.java.RequestHeader; @@ -360,7 +360,7 @@ private void logResponse(final HttpResponse response, final String requestId, fi } catch (Exception e) { - logger.log(String.format("An error occurred trying to log request '%s'", requestId), e); + logger.log(String.format("An error occurred trying to log response '%s'", requestId), e); return; } } diff --git a/src/test/java/com/ingenico/connect/gateway/sdk/java/defaultimpl/DefaultConnectionLoggerTest.java b/src/test/java/com/ingenico/connect/gateway/sdk/java/defaultimpl/DefaultConnectionLoggerTest.java index 675060042..4900fa631 100644 --- a/src/test/java/com/ingenico/connect/gateway/sdk/java/defaultimpl/DefaultConnectionLoggerTest.java +++ b/src/test/java/com/ingenico/connect/gateway/sdk/java/defaultimpl/DefaultConnectionLoggerTest.java @@ -633,9 +633,9 @@ private String assertRequest(String requestMessage, String resourcePrefix) throw final String requestResource = resourcePrefix + ".request"; - Pattern requestPattern = Pattern.compile(readResource(requestResource), Pattern.DOTALL); + Pattern requestPattern = Pattern.compile(normalizeLineBreaks(readResource(requestResource)), Pattern.DOTALL); - Matcher requestMatcher = requestPattern.matcher(requestMessage); + Matcher requestMatcher = requestPattern.matcher(normalizeLineBreaks(requestMessage)); Assert.assertTrue("request message '" + requestMessage + "' does not match pattern " + requestPattern, requestMatcher.matches()); String requestId = requestMatcher.group(1); @@ -650,9 +650,9 @@ private String assertResponse(String responseMessage, String resourcePrefix) thr private String assertResponse(String responseMessage, String resourcePrefix, String requestId) throws IOException { final String responseResource = resourcePrefix + ".response"; - Pattern responsePattern = Pattern.compile(readResource(responseResource), Pattern.DOTALL); + Pattern responsePattern = Pattern.compile(normalizeLineBreaks(readResource(responseResource)), Pattern.DOTALL); - Matcher responseMatcher = responsePattern.matcher(responseMessage); + Matcher responseMatcher = responsePattern.matcher(normalizeLineBreaks(responseMessage)); Assert.assertTrue("response message '" + responseMessage + "' does not match pattern " + responsePattern, responseMatcher.matches()); String responseRequestId = responseMatcher.group(1); @@ -673,9 +673,9 @@ private String assertError(String errorMessage) throws IOException { private String assertError(String errorMessage, String requestId) throws IOException { final String errorResource = "generic.error"; - Pattern errorPattern = Pattern.compile(readResource(errorResource), Pattern.DOTALL); + Pattern errorPattern = Pattern.compile(normalizeLineBreaks(readResource(errorResource)), Pattern.DOTALL); - Matcher errorMatcher = errorPattern.matcher(errorMessage); + Matcher errorMatcher = errorPattern.matcher(normalizeLineBreaks(errorMessage)); Assert.assertTrue("error message '" + errorMessage + "' does not match pattern " + errorPattern, errorMatcher.matches()); String errorRequestId = errorMatcher.group(1); @@ -687,7 +687,6 @@ private String assertError(String errorMessage, String requestId) throws IOExcep } return requestId; - } // Mockito answer utility methods @@ -846,6 +845,12 @@ private String readResource(String resource) throws IOException { return result.toString(); } + private String normalizeLineBreaks(String value) { + // Normalize line breaks to always use the same, regardless of the operating system + // See https://github.com/Ingenico-ePayments/connect-sdk-java/issues/3 + return value.replace("\r", ""); + } + private static final class TestLogger implements CommunicatorLogger { private List entries = new ArrayList();