Release 4.0.11

Author: pavlo-vo

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.10</version>
+    <version>4.0.11</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.10"
+compile "ch.postfinance:postfinancecheckout-java-sdk:4.0.11"
 ```
 
 ### Others
@@ -46,7 +46,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/postfinancecheckout-java-sdk-4.0.10.jar`
+* `target/postfinancecheckout-java-sdk-4.0.11.jar`
 * `target/lib/*.jar`
 
 ## Usage

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'ch.postfinance'
-version = '4.0.10'
+version = '4.0.11'
 
 buildscript {
     repositories {
@@ -95,9 +95,10 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.17"
-    jackson_version = "2.12.7"
+    jackson_version = "2.13.4"
+    jackson_databind_version = "2.13.4.1"
     google_api_client_version = "1.23.0"
-    jersey_common_version = "2.29.1"
+    jersey_common_version = "2.34"
     jodatime_version = "2.9.9"
     junit_version = "4.13.2"
 }
@@ -108,7 +109,7 @@ dependencies {
     compile "org.glassfish.jersey.core:jersey-common:${jersey_common_version}"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
     compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     testCompile "junit:junit:$junit_version"

build.sbt

@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
   settings(
     organization := "ch.postfinance",
     name := "postfinancecheckout-java-sdk",
-    version := "4.0.10",
+    version := "4.0.11",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),
@@ -11,11 +11,11 @@ lazy val root = (project in file(".")).
     libraryDependencies ++= Seq(
       "io.swagger" % "swagger-annotations" % "1.5.17",
       "com.google.api-client" % "google-api-client" % "1.23.0",
-      "org.glassfish.jersey.core" % "jersey-common" % "2.29.1",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.12.7" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.12.7" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.7" % "compile",
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.12.7" % "compile",
+      "org.glassfish.jersey.core" % "jersey-common" % "2.34",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.13.4" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.4" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.4.1" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.13.4" % "compile",
       "junit" % "junit" % "4.13.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>postfinancecheckout-java-sdk</artifactId>
     <packaging>jar</packaging>
     <name>postfinancecheckout-java-sdk</name>
-    <version>4.0.10</version>
+    <version>4.0.11</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>
@@ -289,7 +289,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson-version}</version>
+            <version>${jackson-databind-version}</version>
         </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -309,8 +309,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>1.5.17</swagger-annotations-version>
         <google-api-client-version>1.23.0</google-api-client-version>
-        <jersey-common-version>2.29.1</jersey-common-version>
-        <jackson-version>2.12.7</jackson-version>
+        <jersey-common-version>2.34</jersey-common-version>
+        <jackson-version>2.13.4</jackson-version>
+        <jackson-databind-version>2.13.4.1</jackson-databind-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13.2</junit-version>
     </properties>

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.10");
+        headers.put("x-meta-sdk-version", "4.0.11");
         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/model/PaymentInitiationAdviceFile.java

@@ -22,6 +22,7 @@
 import java.util.Objects;
 import java.util.Arrays;
 import ch.postfinance.sdk.model.PaymentInitiationAdviceFileState;
+import ch.postfinance.sdk.model.PaymentProcessor;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -62,6 +63,10 @@ public class PaymentInitiationAdviceFile {
   protected OffsetDateTime processedOn = null;
 
 
+  @JsonProperty("processor")
+  protected PaymentProcessor processor = null;
+
+  
   @JsonProperty("state")
   protected PaymentInitiationAdviceFileState state = null;
 
@@ -127,6 +132,16 @@ public OffsetDateTime getProcessedOn() {
   }
 
 
+   /**
+   * 
+   * @return processor
+  **/
+  @ApiModelProperty(value = "")
+  public PaymentProcessor getProcessor() {
+    return processor;
+  }
+
+  
    /**
    * 
    * @return state
@@ -153,12 +168,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.linkedSpaceId, paymentInitiationAdviceFile.linkedSpaceId) &&
         Objects.equals(this.name, paymentInitiationAdviceFile.name) &&
         Objects.equals(this.processedOn, paymentInitiationAdviceFile.processedOn) &&
+        Objects.equals(this.processor, paymentInitiationAdviceFile.processor) &&
         Objects.equals(this.state, paymentInitiationAdviceFile.state);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(createdOn, fileGeneratedOn, id, linkedSpaceId, name, processedOn, state);
+    return Objects.hash(createdOn, fileGeneratedOn, id, linkedSpaceId, name, processedOn, processor, state);
   }
 
 
@@ -173,6 +189,7 @@ public String toString() {
     sb.append("    linkedSpaceId: ").append(toIndentedString(linkedSpaceId)).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    processedOn: ").append(toIndentedString(processedOn)).append("\n");
+    sb.append("    processor: ").append(toIndentedString(processor)).append("\n");
     sb.append("    state: ").append(toIndentedString(state)).append("\n");
     sb.append("}");
     return sb.toString();

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

@@ -33,7 +33,11 @@
  */
 public enum PaymentInitiationAdviceFileState {
 
-  PENDING("PENDING"),
+  CREATED("CREATED"),
+  
+  UPLOADED("UPLOADED"),
+  
+  DOWNLOADED("DOWNLOADED"),
 
   PROCESSED("PROCESSED");
 

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

@@ -135,6 +135,10 @@ public class TransactionCompletion extends TransactionAwareEntity {
   protected TransactionCompletionState state = null;
 
 
+  @JsonProperty("statementDescriptor")
+  protected String statementDescriptor = null;
+
+  
   @JsonProperty("succeededOn")
   protected OffsetDateTime succeededOn = null;
 
@@ -376,6 +380,16 @@ public TransactionCompletionState getState() {
   }
 
 
+   /**
+   * The statement descriptor explain charges or payments on bank statements.
+   * @return statementDescriptor
+  **/
+  @ApiModelProperty(value = "The statement descriptor explain charges or payments on bank statements.")
+  public String getStatementDescriptor() {
+    return statementDescriptor;
+  }
+
+  
    /**
    * 
    * @return succeededOn
@@ -461,6 +475,7 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.remainingLineItems, transactionCompletion.remainingLineItems) &&
         Objects.equals(this.spaceViewId, transactionCompletion.spaceViewId) &&
         Objects.equals(this.state, transactionCompletion.state) &&
+        Objects.equals(this.statementDescriptor, transactionCompletion.statementDescriptor) &&
         Objects.equals(this.succeededOn, transactionCompletion.succeededOn) &&
         Objects.equals(this.taxAmount, transactionCompletion.taxAmount) &&
         Objects.equals(this.timeZone, transactionCompletion.timeZone) &&
@@ -471,7 +486,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, linkedSpaceId, linkedTransaction, amount, baseLineItems, createdBy, createdOn, externalId, failedOn, failureReason, invoiceMerchantReference, labels, language, lastCompletion, lineItemVersion, lineItems, mode, nextUpdateOn, paymentInformation, plannedPurgeDate, processingOn, processorReference, remainingLineItems, spaceViewId, state, succeededOn, taxAmount, timeZone, timeoutOn, version, super.hashCode());
+    return Objects.hash(id, linkedSpaceId, linkedTransaction, amount, baseLineItems, createdBy, createdOn, externalId, failedOn, failureReason, invoiceMerchantReference, labels, language, lastCompletion, lineItemVersion, lineItems, mode, nextUpdateOn, paymentInformation, plannedPurgeDate, processingOn, processorReference, remainingLineItems, spaceViewId, state, statementDescriptor, succeededOn, taxAmount, timeZone, timeoutOn, version, super.hashCode());
   }
 
 
@@ -505,6 +520,7 @@ public String toString() {
     sb.append("    remainingLineItems: ").append(toIndentedString(remainingLineItems)).append("\n");
     sb.append("    spaceViewId: ").append(toIndentedString(spaceViewId)).append("\n");
     sb.append("    state: ").append(toIndentedString(state)).append("\n");
+    sb.append("    statementDescriptor: ").append(toIndentedString(statementDescriptor)).append("\n");
     sb.append("    succeededOn: ").append(toIndentedString(succeededOn)).append("\n");
     sb.append("    taxAmount: ").append(toIndentedString(taxAmount)).append("\n");
     sb.append("    timeZone: ").append(toIndentedString(timeZone)).append("\n");

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

@@ -55,6 +55,10 @@ public class TransactionCompletionRequest {
   protected List<CompletionLineItemCreate> lineItems = null;
 
 
+  @JsonProperty("statementDescriptor")
+  protected String statementDescriptor = null;
+
+  
   @JsonProperty("transactionId")
   protected Long transactionId = null;
 
@@ -144,6 +148,25 @@ public void setLineItems(List<CompletionLineItemCreate> lineItems) {
   }
 
 
+  public TransactionCompletionRequest statementDescriptor(String statementDescriptor) {
+    this.statementDescriptor = statementDescriptor;
+    return this;
+  }
+
+   /**
+   * The statement descriptor explain charges or payments on bank statements.
+   * @return statementDescriptor
+  **/
+  @ApiModelProperty(value = "The statement descriptor explain charges or payments on bank statements.")
+  public String getStatementDescriptor() {
+    return statementDescriptor;
+  }
+
+  public void setStatementDescriptor(String statementDescriptor) {
+    this.statementDescriptor = statementDescriptor;
+  }
+
+  
   public TransactionCompletionRequest transactionId(Long transactionId) {
     this.transactionId = transactionId;
     return this;
@@ -177,12 +200,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.invoiceMerchantReference, transactionCompletionRequest.invoiceMerchantReference) &&
         Objects.equals(this.lastCompletion, transactionCompletionRequest.lastCompletion) &&
         Objects.equals(this.lineItems, transactionCompletionRequest.lineItems) &&
+        Objects.equals(this.statementDescriptor, transactionCompletionRequest.statementDescriptor) &&
         Objects.equals(this.transactionId, transactionCompletionRequest.transactionId);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(externalId, invoiceMerchantReference, lastCompletion, lineItems, transactionId);
+    return Objects.hash(externalId, invoiceMerchantReference, lastCompletion, lineItems, statementDescriptor, transactionId);
   }
 
 
@@ -195,6 +219,7 @@ public String toString() {
     sb.append("    invoiceMerchantReference: ").append(toIndentedString(invoiceMerchantReference)).append("\n");
     sb.append("    lastCompletion: ").append(toIndentedString(lastCompletion)).append("\n");
     sb.append("    lineItems: ").append(toIndentedString(lineItems)).append("\n");
+    sb.append("    statementDescriptor: ").append(toIndentedString(statementDescriptor)).append("\n");
     sb.append("    transactionId: ").append(toIndentedString(transactionId)).append("\n");
     sb.append("}");
     return sb.toString();