Release 3.0.1

Thomas Hunziker · Thomas Hunziker · commit 7ea825aef013 · 2021-05-07T07:19:32.000+02:00
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.postfinancecheckout</groupId>
     <artifactId>postfinancecheckout-java-sdk</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</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 "com.postfinancecheckout:postfinancecheckout-java-sdk:3.0.0"
+compile "com.postfinancecheckout:postfinancecheckout-java-sdk:3.0.1"
 ```
 
 ### Others
@@ -46,7 +46,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/postfinancecheckout-java-sdk-3.0.0.jar`
+* `target/postfinancecheckout-java-sdk-3.0.1.jar`
 * `target/lib/*.jar`
 
 ## Usage
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.postfinancecheckout'
-version = '3.0.0'
+version = '3.0.1'
 
 buildscript {
     repositories {
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
   settings(
     organization := "com.postfinancecheckout",
     name := "postfinancecheckout-java-sdk",
-    version := "3.0.0",
+    version := "3.0.1",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>postfinancecheckout-java-sdk</artifactId>
     <packaging>jar</packaging>
     <name>postfinancecheckout-java-sdk</name>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <url>https://www.postfinance.ch/checkout</url>
     <description>The SDK for simplifying the integration with PostFinance Checkout API.</description>
     <scm>
diff --git a/src/main/java/com/postfinancecheckout/sdk/model/PaymentContract.java b/src/main/java/com/postfinancecheckout/sdk/model/PaymentContract.java
@@ -164,10 +164,10 @@ public OffsetDateTime getCreatedOn() {
 
   
    /**
-   * The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.
+   * A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.
    * @return externalId
   **/
-  @ApiModelProperty(value = "The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.")
+  @ApiModelProperty(value = "A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.")
   public String getExternalId() {
     return externalId;
   }
diff --git a/src/main/java/com/postfinancecheckout/sdk/model/PaymentLink.java b/src/main/java/com/postfinancecheckout/sdk/model/PaymentLink.java
@@ -182,10 +182,10 @@ public String getCurrency() {
 
   
    /**
-   * The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.
+   * A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.
    * @return externalId
   **/
-  @ApiModelProperty(value = "The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.")
+  @ApiModelProperty(value = "A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.")
   public String getExternalId() {
     return externalId;
   }
diff --git a/src/main/java/com/postfinancecheckout/sdk/model/PaymentLinkCreate.java b/src/main/java/com/postfinancecheckout/sdk/model/PaymentLinkCreate.java
@@ -78,10 +78,10 @@ public PaymentLinkCreate externalId(String externalId) {
   }
 
    /**
-   * The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.
+   * A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.
    * @return externalId
   **/
-  @ApiModelProperty(required = true, value = "The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.")
+  @ApiModelProperty(required = true, value = "A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.")
   public String getExternalId() {
     return externalId;
   }
diff --git a/src/main/java/com/postfinancecheckout/sdk/model/PaymentTerminalLocation.java b/src/main/java/com/postfinancecheckout/sdk/model/PaymentTerminalLocation.java
@@ -25,7 +25,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.postfinancecheckout.sdk.model.PaymentTerminalAddress;
-import com.postfinancecheckout.sdk.model.PaymentTerminalConfiguration;
 import com.postfinancecheckout.sdk.model.PaymentTerminalLocationState;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -44,10 +43,6 @@ public class PaymentTerminalLocation {
   protected PaymentTerminalAddress contactAddress = null;
 
   
-  @JsonProperty("defaultConfiguration")
-  protected PaymentTerminalConfiguration defaultConfiguration = null;
-
-  
   @JsonProperty("id")
   protected Long id = null;
 
@@ -83,16 +78,6 @@ public PaymentTerminalAddress getContactAddress() {
   }
 
   
-   /**
-   * 
-   * @return defaultConfiguration
-  **/
-  @ApiModelProperty(value = "")
-  public PaymentTerminalConfiguration getDefaultConfiguration() {
-    return defaultConfiguration;
-  }
-
-  
    /**
    * The ID is the primary key of the entity. The ID identifies the entity uniquely.
    * @return id
@@ -164,7 +149,6 @@ public boolean equals(java.lang.Object o) {
     }
     PaymentTerminalLocation paymentTerminalLocation = (PaymentTerminalLocation) o;
     return Objects.equals(this.contactAddress, paymentTerminalLocation.contactAddress) &&
-        Objects.equals(this.defaultConfiguration, paymentTerminalLocation.defaultConfiguration) &&
         Objects.equals(this.id, paymentTerminalLocation.id) &&
         Objects.equals(this.linkedSpaceId, paymentTerminalLocation.linkedSpaceId) &&
         Objects.equals(this.name, paymentTerminalLocation.name) &&
@@ -175,7 +159,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(contactAddress, defaultConfiguration, id, linkedSpaceId, name, plannedPurgeDate, state, version);
+    return Objects.hash(contactAddress, id, linkedSpaceId, name, plannedPurgeDate, state, version);
   }
 
 
@@ -185,7 +169,6 @@ public String toString() {
     sb.append("class PaymentTerminalLocation {\n");
     
     sb.append("    contactAddress: ").append(toIndentedString(contactAddress)).append("\n");
-    sb.append("    defaultConfiguration: ").append(toIndentedString(defaultConfiguration)).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");
diff --git a/src/main/java/com/postfinancecheckout/sdk/model/Token.java b/src/main/java/com/postfinancecheckout/sdk/model/Token.java
@@ -132,10 +132,10 @@ public Boolean isEnabledForOneClickPayment() {
 
   
    /**
-   * The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.
+   * A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.
    * @return externalId
   **/
-  @ApiModelProperty(value = "The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.")
+  @ApiModelProperty(value = "A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.")
   public String getExternalId() {
     return externalId;
   }
diff --git a/src/main/java/com/postfinancecheckout/sdk/model/TokenCreate.java b/src/main/java/com/postfinancecheckout/sdk/model/TokenCreate.java
@@ -53,10 +53,10 @@ public TokenCreate externalId(String externalId) {
   }
 
    /**
-   * The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.
+   * A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.
    * @return externalId
   **/
-  @ApiModelProperty(required = true, value = "The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.")
+  @ApiModelProperty(required = true, value = "A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.")
   public String getExternalId() {
     return externalId;
   }
diff --git a/src/main/java/com/postfinancecheckout/sdk/service/TokenService.java b/src/main/java/com/postfinancecheckout/sdk/service/TokenService.java
@@ -2,6 +2,7 @@
 
 import com.postfinancecheckout.sdk.ApiClient;
 
+import com.postfinancecheckout.sdk.model.Charge;
 import com.postfinancecheckout.sdk.model.ClientError;
 import com.postfinancecheckout.sdk.model.EntityQuery;
 import com.postfinancecheckout.sdk.model.EntityQueryFilter;
@@ -879,6 +880,140 @@ public HttpResponse deleteForHttpResponse(Long spaceId, Long id, Map<String, Obj
         HttpRequest httpRequest = apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content);
         
         
+        httpRequest.setReadTimeout(ApiClient.READ_TIMEOUT);
+        return httpRequest.execute();
+    }
+
+  /**
+    * Process Transaction
+    * This operation processes the given transaction by using the token associated with the transaction.
+    * <p><b>200</b> - This status code indicates that a client request was successfully received, understood, and accepted.
+    * <p><b>442</b> - This status code indicates that the server cannot or will not process the request due to something that is perceived to be a client error.
+    * <p><b>542</b> - This status code indicates that the server encountered an unexpected condition that prevented it from fulfilling the client request.
+    * @param spaceId 
+    * @param transactionId The id of the transaction for which we want to check if the token can be created or not.
+    * @return Charge
+    * @throws IOException if an error occurs while attempting to invoke the API
+    * For more information visit this link.
+    * @see <a href="https://checkout.postfinance.ch/doc/api/web-service#token-service--process-transaction">Process Transaction Documentation</a>
+
+    **/
+    public Charge processTransaction(Long spaceId, Long transactionId) throws IOException {
+        HttpResponse response = processTransactionForHttpResponse(spaceId, transactionId);
+        String returnType = "Charge";
+        if(returnType.equals("String")){
+          return (Charge) (Object) response.parseAsString();
+        }
+        TypeReference typeRef = new TypeReference<Charge>() {};
+        return (Charge)apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
+    }
+
+  /**
+    * Process Transaction
+    * This operation processes the given transaction by using the token associated with the transaction.
+    * <p><b>200</b> - This status code indicates that a client request was successfully received, understood, and accepted.
+    * <p><b>442</b> - This status code indicates that the server cannot or will not process the request due to something that is perceived to be a client error.
+    * <p><b>542</b> - This status code indicates that the server encountered an unexpected condition that prevented it from fulfilling the client request.
+    * @param spaceId 
+    * @param transactionId The id of the transaction for which we want to check if the token can be created or not.
+    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
+    * @return Charge
+    * @throws IOException if an error occurs while attempting to invoke the API
+    * For more information visit this link.
+    * @see <a href="https://checkout.postfinance.ch/doc/api/web-service#token-service--process-transaction">Process Transaction Documentation</a>
+
+    **/
+    public Charge processTransaction(Long spaceId, Long transactionId, Map<String, Object> params) throws IOException {
+        HttpResponse response = processTransactionForHttpResponse(spaceId, transactionId, params);
+        String returnType = "Charge";
+        if(returnType.equals("String")){
+            return (Charge) (Object) response.parseAsString();
+        }
+        TypeReference typeRef = new TypeReference<Charge>() {};
+        return (Charge)apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
+    }
+
+    public HttpResponse processTransactionForHttpResponse(Long spaceId, Long transactionId) throws IOException {
+        // verify the required parameter 'spaceId' is set
+        if (spaceId == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'spaceId' when calling processTransaction");
+        }// verify the required parameter 'transactionId' is set
+        if (transactionId == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'transactionId' when calling processTransaction");
+        }
+        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/token/process-transaction");
+        if (spaceId != null) {
+            String key = "spaceId";
+            Object value = spaceId;
+            if (value instanceof Collection) {
+                uriBuilder = uriBuilder.queryParam(key, ((Collection) value).toArray());
+            } else if (value instanceof Object[]) {
+                uriBuilder = uriBuilder.queryParam(key, (Object[]) value);
+            } else {
+                uriBuilder = uriBuilder.queryParam(key, value);
+            }
+        }        if (transactionId != null) {
+            String key = "transactionId";
+            Object value = transactionId;
+            if (value instanceof Collection) {
+                uriBuilder = uriBuilder.queryParam(key, ((Collection) value).toArray());
+            } else if (value instanceof Object[]) {
+                uriBuilder = uriBuilder.queryParam(key, (Object[]) value);
+            } else {
+                uriBuilder = uriBuilder.queryParam(key, value);
+            }
+        }
+
+        String url = uriBuilder.build().toString();
+        GenericUrl genericUrl = new GenericUrl(url);
+
+        HttpContent content = apiClient.new JacksonJsonHttpContent(null);
+        HttpRequest httpRequest = apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content);
+        
+        
+        httpRequest.setReadTimeout(ApiClient.READ_TIMEOUT);
+        return httpRequest.execute();
+    }
+
+    public HttpResponse processTransactionForHttpResponse(Long spaceId, Long transactionId, Map<String, Object> params) throws IOException {
+        // verify the required parameter 'spaceId' is set
+        if (spaceId == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'spaceId' when calling processTransaction");
+        }// verify the required parameter 'transactionId' is set
+        if (transactionId == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'transactionId' when calling processTransaction");
+        }
+        UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/token/process-transaction");
+
+        // Copy the params argument if present, to allow passing in immutable maps
+        Map<String, Object> allParams = params == null ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+        // Add the required query param 'spaceId' to the map of query params
+        allParams.put("spaceId", spaceId);
+        // Add the required query param 'transactionId' to the map of query params
+        allParams.put("transactionId", transactionId);
+
+        for (Map.Entry<String, Object> entryMap: allParams.entrySet()) {
+            String key = entryMap.getKey();
+            Object value = entryMap.getValue();
+
+            if (key != null && value != null) {
+                if (value instanceof Collection) {
+                    uriBuilder = uriBuilder.queryParam(key, ((Collection) value).toArray());
+                } else if (value instanceof Object[]) {
+                    uriBuilder = uriBuilder.queryParam(key, (Object[]) value);
+                } else {
+                    uriBuilder = uriBuilder.queryParam(key, value);
+                }
+            }
+        }
+
+        String url = uriBuilder.build().toString();
+        GenericUrl genericUrl = new GenericUrl(url);
+
+        HttpContent content = apiClient.new JacksonJsonHttpContent(null);
+        HttpRequest httpRequest = apiClient.getHttpRequestFactory().buildRequest(HttpMethods.POST, genericUrl, content);
+        
+        
         httpRequest.setReadTimeout(ApiClient.READ_TIMEOUT);
         return httpRequest.execute();
     }

Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,10 @@ public PaymentLinkCreate externalId(String externalId) {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`
`81`		`- * The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.`
	`81`	`+ * A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.`
`82`	`82`	`* @return externalId`
`83`	`83`	`**/`
`84`		`- @ApiModelProperty(required = true, value = "The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.")`
	`84`	`+ @ApiModelProperty(required = true, value = "A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.")`
`85`	`85`	`public String getExternalId() {`
`86`	`86`	`return externalId;`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,10 @@ public TokenCreate externalId(String externalId) {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`
`56`		`- * The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.`
	`56`	`+ * A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.`
`57`	`57`	`* @return externalId`
`58`	`58`	`**/`
`59`		`- @ApiModelProperty(required = true, value = "The external id helps to identify the entity and a subsequent creation of an entity with the same ID will not create a new entity.")`
	`59`	`+ @ApiModelProperty(required = true, value = "A client generated nonce which identifies the entity to be created. Subsequent creation requests with the same external ID will not create new entities but return the initially created entity instead.")`
`60`	`60`	`public String getExternalId() {`
`61`	`61`	`return externalId;`
`62`	`62`	`}`