Release 5.0.0

Author: wallee-deployment-user

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 wallee AG
+   Copyright 2023 wallee AG
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -23,7 +23,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>ch.postfinance</groupId>
     <artifactId>postfinancecheckout-java-sdk</artifactId>
-    <version>4.0.15</version>
+    <version>5.0.0</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -33,7 +33,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "ch.postfinance:postfinancecheckout-java-sdk:4.0.15"
+compile "ch.postfinance:postfinancecheckout-java-sdk:5.0.0"
 ```
 
 ### Others
@@ -46,7 +46,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/postfinancecheckout-java-sdk-4.0.15.jar`
+* `target/postfinancecheckout-java-sdk-5.0.0.jar`
 * `target/lib/*.jar`
 
 ## Usage
@@ -72,6 +72,9 @@ public class Example {
         // API Client
         ApiClient apiClient = new ApiClient(userId, secret);
 
+        //Setup a custom connection timeout if needed. (Default value is: 25 seconds)
+        apiClient.setReadTimeOut(20);
+
         // Create an API service instance:
         TransactionService transactionService = apiClient.getTransactionService();
 

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'ch.postfinance'
-version = '4.0.15'
+version = '5.0.0'
 
 buildscript {
     repositories {

build.sbt

@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
   settings(
     organization := "ch.postfinance",
     name := "postfinancecheckout-java-sdk",
-    version := "4.0.15",
+    version := "5.0.0",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>postfinancecheckout-java-sdk</artifactId>
     <packaging>jar</packaging>
     <name>postfinancecheckout-java-sdk</name>
-    <version>4.0.15</version>
+    <version>5.0.0</version>
     <url>https://postfinance.ch/en/business/products/e-commerce/postfinance-checkout-all-in-one.html</url>
     <description>The SDK for simplifying the integration with PostFinance Checkout API.</description>
     <scm>

src/main/java/ch/postfinance/sdk/ApiClient.java

@@ -21,13 +21,13 @@
 
 
 public class ApiClient {
+    private int readTimeOut = 25;
     private final String basePath;
     private final HttpRequestFactory httpRequestFactory;
     private final ObjectMapper objectMapper;
     private final long userId;
     private final String applicationKey;
     private final Map<String, String> defaultHeaders;
-    public final static int READ_TIMEOUT = 20 * 1000;
 
     // A reasonable default object mapper. Client can pass in a chosen ObjectMapper anyway, this is just for reasonable defaults.
     private static ObjectMapper createDefaultObjectMapper() {
@@ -102,6 +102,14 @@ public ObjectMapper getObjectMapper() {
         return objectMapper;
     }
 
+    public int getReadTimeOut() {
+        return readTimeOut;
+    }
+
+    public void setReadTimeOut(int readTimeOut) {
+        this.readTimeOut = readTimeOut;
+    }
+
     public class JacksonJsonHttpContent extends AbstractHttpContent {
         /* A POJO that can be serialized with a com.fasterxml Jackson ObjectMapper */
         private final Object data;

src/main/java/ch/postfinance/sdk/DefaultHeaders.java

@@ -34,7 +34,7 @@ public void intercept(HttpRequest request) throws IOException {
 
     private HttpHeaders getDefaultHeaders() {
         HttpHeaders headers = new HttpHeaders();
-        headers.put("x-meta-sdk-version", "4.0.15");
+        headers.put("x-meta-sdk-version", "5.0.0");
         headers.put("x-meta-sdk-language", "java");
         headers.put("x-meta-sdk-provider", "PostFinance Checkout");
         headers.put("x-meta-sdk-language-version", System.getProperty("java.version"));

src/main/java/ch/postfinance/sdk/ErrorCode.java

@@ -0,0 +1,51 @@
+/**
+* PostFinance Checkout SDK
+*
+* This library allows to interact with the PostFinance Checkout payment service.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+
+package ch.postfinance.sdk;
+
+/**
+ * The error code represents a potential error which may be thrown by Wallee SDK.
+ *
+ */
+public enum ErrorCode {
+
+    ENTITY_NOT_FOUND(0, "Entity not found")
+    ;
+
+    private final int code;
+    private final String description;
+
+    private ErrorCode(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    @Override
+    public String toString() {
+        return code + ": " + description;
+    }
+}

src/main/java/ch/postfinance/sdk/PostFinanceCheckoutSdkException.java

@@ -0,0 +1,41 @@
+/**
+* PostFinance Checkout SDK
+*
+* This library allows to interact with the PostFinance Checkout payment service.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+
+package ch.postfinance.sdk;
+
+/**
+ * Exception thrown when the PostFinanceCheckout SDK API call results in an invalid response.
+ */
+public class PostFinanceCheckoutSdkException extends RuntimeException {
+
+    private static final long serialVersionUID = 1675383192982547616L;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param errorCode
+	 *            the PostFinanceCheckout SDK error code
+	 * @param message
+	 *            the exception message details
+	 */
+    public PostFinanceCheckoutSdkException(ErrorCode errorCode, String message) {
+        super(String.format("Error code: %d. %s", errorCode.getCode(), message));
+    }
+
+}

src/main/java/ch/postfinance/sdk/model/PaymentInitiationAdviceFile.java

@@ -43,10 +43,18 @@ public class PaymentInitiationAdviceFile {
   protected OffsetDateTime createdOn = null;
 
 
+  @JsonProperty("failureMessage")
+  protected String failureMessage = null;
+
+  
   @JsonProperty("fileGeneratedOn")
   protected OffsetDateTime fileGeneratedOn = null;
 
 
+  @JsonProperty("forwardedOn")
+  protected OffsetDateTime forwardedOn = null;
+
+  
   @JsonProperty("id")
   protected Long id = null;
 
@@ -82,6 +90,16 @@ public OffsetDateTime getCreatedOn() {
   }
 
 
+   /**
+   * 
+   * @return failureMessage
+  **/
+  @ApiModelProperty(value = "")
+  public String getFailureMessage() {
+    return failureMessage;
+  }
+
+  
    /**
    * 
    * @return fileGeneratedOn
@@ -92,6 +110,16 @@ public OffsetDateTime getFileGeneratedOn() {
   }
 
 
+   /**
+   * The shipping date indicates the date on which the pain file was transferred to an external processing system.
+   * @return forwardedOn
+  **/
+  @ApiModelProperty(value = "The shipping date indicates the date on which the pain file was transferred to an external processing system.")
+  public OffsetDateTime getForwardedOn() {
+    return forwardedOn;
+  }
+
+  
    /**
    * The ID is the primary key of the entity. The ID identifies the entity uniquely.
    * @return id
@@ -163,7 +191,9 @@ public boolean equals(java.lang.Object o) {
     }
     PaymentInitiationAdviceFile paymentInitiationAdviceFile = (PaymentInitiationAdviceFile) o;
     return Objects.equals(this.createdOn, paymentInitiationAdviceFile.createdOn) &&
+        Objects.equals(this.failureMessage, paymentInitiationAdviceFile.failureMessage) &&
         Objects.equals(this.fileGeneratedOn, paymentInitiationAdviceFile.fileGeneratedOn) &&
+        Objects.equals(this.forwardedOn, paymentInitiationAdviceFile.forwardedOn) &&
         Objects.equals(this.id, paymentInitiationAdviceFile.id) &&
         Objects.equals(this.linkedSpaceId, paymentInitiationAdviceFile.linkedSpaceId) &&
         Objects.equals(this.name, paymentInitiationAdviceFile.name) &&
@@ -174,7 +204,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(createdOn, fileGeneratedOn, id, linkedSpaceId, name, processedOn, processor, state);
+    return Objects.hash(createdOn, failureMessage, fileGeneratedOn, forwardedOn, id, linkedSpaceId, name, processedOn, processor, state);
   }
 
 
@@ -184,7 +214,9 @@ public String toString() {
     sb.append("class PaymentInitiationAdviceFile {\n");
 
     sb.append("    createdOn: ").append(toIndentedString(createdOn)).append("\n");
+    sb.append("    failureMessage: ").append(toIndentedString(failureMessage)).append("\n");
     sb.append("    fileGeneratedOn: ").append(toIndentedString(fileGeneratedOn)).append("\n");
+    sb.append("    forwardedOn: ").append(toIndentedString(forwardedOn)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    linkedSpaceId: ").append(toIndentedString(linkedSpaceId)).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");