Skip to content

Commit

Permalink
Release 4.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewrowanwallee committed Jun 13, 2022
1 parent 12b0d1f commit 05bd18c
Show file tree
Hide file tree
Showing 24 changed files with 3,265 additions and 121 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Add this dependency to your project's POM:
<dependency>
<groupId>ch.postfinance</groupId>
<artifactId>postfinancecheckout-java-sdk</artifactId>
<version>4.1.3</version>
<version>4.0.3</version>
<scope>compile</scope>
</dependency>
```
Expand All @@ -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.1.3"
compile "ch.postfinance:postfinancecheckout-java-sdk:4.0.3"
```

### Others
Expand All @@ -46,7 +46,7 @@ mvn clean package

Then manually install the following JARs:

* `target/postfinancecheckout-java-sdk-4.1.3.jar`
* `target/postfinancecheckout-java-sdk-4.0.3.jar`
* `target/lib/*.jar`

## Usage
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'idea'
apply plugin: 'eclipse'

group = 'ch.postfinance'
version = '4.1.3'
version = '4.0.3'

buildscript {
repositories {
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
settings(
organization := "ch.postfinance",
name := "postfinancecheckout-java-sdk",
version := "4.1.3",
version := "4.0.3",
scalaVersion := "2.11.4",
scalacOptions ++= Seq("-feature"),
javacOptions in compile ++= Seq("-Xlint:deprecation"),
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>postfinancecheckout-java-sdk</artifactId>
<packaging>jar</packaging>
<name>postfinancecheckout-java-sdk</name>
<version>4.1.3</version>
<version>4.0.3</version>
<url>https://www.postfinance.ch/checkout</url>
<description>The SDK for simplifying the integration with PostFinance Checkout API.</description>
<scm>
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/ch/postfinance/sdk/ApiClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,14 @@ public InvoiceReconciliationRecordService getInvoiceReconciliationRecordService(
return this.invoiceReconciliationRecordService;
}

private InvoiceReimbursementService invoiceReimbursementService;
public InvoiceReimbursementService getInvoiceReimbursementService() {
if (this.invoiceReimbursementService == null) {
this.invoiceReimbursementService = new InvoiceReimbursementService(this);
}
return this.invoiceReimbursementService;
}

private LabelDescriptionGroupService labelDescriptionGroupService;
public LabelDescriptionGroupService getLabelDescriptionGroupService() {
if (this.labelDescriptionGroupService == null) {
Expand Down Expand Up @@ -421,6 +429,14 @@ public PaymentTerminalTillService getPaymentTerminalTillService() {
return this.paymentTerminalTillService;
}

private PaymentTerminalTransactionSummaryService paymentTerminalTransactionSummaryService;
public PaymentTerminalTransactionSummaryService getPaymentTerminalTransactionSummaryService() {
if (this.paymentTerminalTransactionSummaryService == null) {
this.paymentTerminalTransactionSummaryService = new PaymentTerminalTransactionSummaryService(this);
}
return this.paymentTerminalTransactionSummaryService;
}

private PermissionService permissionService;
public PermissionService getPermissionService() {
if (this.permissionService == null) {
Expand Down
19 changes: 18 additions & 1 deletion src/main/java/ch/postfinance/sdk/model/ChargeAttempt.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import ch.postfinance.sdk.model.ChargeAttemptEnvironment;
import ch.postfinance.sdk.model.ChargeAttemptState;
import ch.postfinance.sdk.model.ConnectorInvocation;
import ch.postfinance.sdk.model.CustomersPresence;
import ch.postfinance.sdk.model.FailureReason;
import ch.postfinance.sdk.model.Label;
import ch.postfinance.sdk.model.PaymentConnectorConfiguration;
Expand Down Expand Up @@ -66,6 +67,10 @@ public class ChargeAttempt extends TransactionAwareEntity {
protected OffsetDateTime createdOn = null;


@JsonProperty("customersPresence")
protected CustomersPresence customersPresence = null;


@JsonProperty("environment")
protected ChargeAttemptEnvironment environment = null;

Expand Down Expand Up @@ -187,6 +192,16 @@ public OffsetDateTime getCreatedOn() {
}


/**
* The customers presence indicates which kind of customer interaction was used during the charge attempt.
* @return customersPresence
**/
@ApiModelProperty(value = "The customers presence indicates which kind of customer interaction was used during the charge attempt.")
public CustomersPresence getCustomersPresence() {
return customersPresence;
}


/**
*
* @return environment
Expand Down Expand Up @@ -404,6 +419,7 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.completionBehavior, chargeAttempt.completionBehavior) &&
Objects.equals(this.connectorConfiguration, chargeAttempt.connectorConfiguration) &&
Objects.equals(this.createdOn, chargeAttempt.createdOn) &&
Objects.equals(this.customersPresence, chargeAttempt.customersPresence) &&
Objects.equals(this.environment, chargeAttempt.environment) &&
Objects.equals(this.failedOn, chargeAttempt.failedOn) &&
Objects.equals(this.failureReason, chargeAttempt.failureReason) &&
Expand All @@ -429,7 +445,7 @@ public boolean equals(java.lang.Object o) {

@Override
public int hashCode() {
return Objects.hash(id, linkedSpaceId, linkedTransaction, charge, completionBehavior, connectorConfiguration, createdOn, environment, failedOn, failureReason, initializingTokenVersion, invocation, labels, language, nextUpdateOn, plannedPurgeDate, redirectionUrl, salesChannel, spaceViewId, state, succeededOn, terminal, timeZone, timeoutOn, tokenVersion, userFailureMessage, version, super.hashCode());
return Objects.hash(id, linkedSpaceId, linkedTransaction, charge, completionBehavior, connectorConfiguration, createdOn, customersPresence, environment, failedOn, failureReason, initializingTokenVersion, invocation, labels, language, nextUpdateOn, plannedPurgeDate, redirectionUrl, salesChannel, spaceViewId, state, succeededOn, terminal, timeZone, timeoutOn, tokenVersion, userFailureMessage, version, super.hashCode());
}


Expand All @@ -445,6 +461,7 @@ public String toString() {
sb.append(" completionBehavior: ").append(toIndentedString(completionBehavior)).append("\n");
sb.append(" connectorConfiguration: ").append(toIndentedString(connectorConfiguration)).append("\n");
sb.append(" createdOn: ").append(toIndentedString(createdOn)).append("\n");
sb.append(" customersPresence: ").append(toIndentedString(customersPresence)).append("\n");
sb.append(" environment: ").append(toIndentedString(environment)).append("\n");
sb.append(" failedOn: ").append(toIndentedString(failedOn)).append("\n");
sb.append(" failureReason: ").append(toIndentedString(failureReason)).append("\n");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@

import java.util.Objects;
import java.util.Arrays;
import ch.postfinance.sdk.model.ChargeAttemptEnvironment;
import ch.postfinance.sdk.model.FailureReason;
import ch.postfinance.sdk.model.InvoiceReconciliationRecordRejectionStatus;
import ch.postfinance.sdk.model.InvoiceReconciliationRecordState;
import ch.postfinance.sdk.model.Transaction;
import ch.postfinance.sdk.model.InvoiceReconciliationRecordType;
import ch.postfinance.sdk.model.TransactionAwareEntity;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
Expand Down Expand Up @@ -75,6 +76,10 @@ public class InvoiceReconciliationRecord extends TransactionAwareEntity {
protected OffsetDateTime discardedOn = null;


@JsonProperty("environment")
protected ChargeAttemptEnvironment environment = null;


@JsonProperty("familyName")
protected String familyName = null;

Expand Down Expand Up @@ -139,8 +144,8 @@ public class InvoiceReconciliationRecord extends TransactionAwareEntity {
protected String street = null;


@JsonProperty("transaction")
protected Transaction transaction = null;
@JsonProperty("type")
protected InvoiceReconciliationRecordType type = null;


@JsonProperty("uniqueId")
Expand Down Expand Up @@ -236,6 +241,16 @@ public OffsetDateTime getDiscardedOn() {
}


/**
*
* @return environment
**/
@ApiModelProperty(value = "")
public ChargeAttemptEnvironment getEnvironment() {
return environment;
}


/**
*
* @return familyName
Expand Down Expand Up @@ -398,11 +413,11 @@ public String getStreet() {

/**
*
* @return transaction
* @return type
**/
@ApiModelProperty(value = "")
public Transaction getTransaction() {
return transaction;
public InvoiceReconciliationRecordType getType() {
return type;
}


Expand Down Expand Up @@ -457,6 +472,7 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.currency, invoiceReconciliationRecord.currency) &&
Objects.equals(this.discardedBy, invoiceReconciliationRecord.discardedBy) &&
Objects.equals(this.discardedOn, invoiceReconciliationRecord.discardedOn) &&
Objects.equals(this.environment, invoiceReconciliationRecord.environment) &&
Objects.equals(this.familyName, invoiceReconciliationRecord.familyName) &&
Objects.equals(this.givenName, invoiceReconciliationRecord.givenName) &&
Objects.equals(this.iban, invoiceReconciliationRecord.iban) &&
Expand All @@ -473,7 +489,7 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.senderBankAccount, invoiceReconciliationRecord.senderBankAccount) &&
Objects.equals(this.state, invoiceReconciliationRecord.state) &&
Objects.equals(this.street, invoiceReconciliationRecord.street) &&
Objects.equals(this.transaction, invoiceReconciliationRecord.transaction) &&
Objects.equals(this.type, invoiceReconciliationRecord.type) &&
Objects.equals(this.uniqueId, invoiceReconciliationRecord.uniqueId) &&
Objects.equals(this.valueDate, invoiceReconciliationRecord.valueDate) &&
Objects.equals(this.version, invoiceReconciliationRecord.version) &&
Expand All @@ -482,7 +498,7 @@ public boolean equals(java.lang.Object o) {

@Override
public int hashCode() {
return Objects.hash(id, linkedSpaceId, linkedTransaction, address, amount, city, country, createdOn, currency, discardedBy, discardedOn, familyName, givenName, iban, lastResolutionFailure, participantNumber, paymentFeeAmount, paymentFeeCurrency, plannedPurgeDate, postCode, referenceNumber, rejectionStatus, resolvedBy, resolvedOn, senderBankAccount, state, street, transaction, uniqueId, valueDate, version, super.hashCode());
return Objects.hash(id, linkedSpaceId, linkedTransaction, address, amount, city, country, createdOn, currency, discardedBy, discardedOn, environment, familyName, givenName, iban, lastResolutionFailure, participantNumber, paymentFeeAmount, paymentFeeCurrency, plannedPurgeDate, postCode, referenceNumber, rejectionStatus, resolvedBy, resolvedOn, senderBankAccount, state, street, type, uniqueId, valueDate, version, super.hashCode());
}


Expand All @@ -502,6 +518,7 @@ public String toString() {
sb.append(" currency: ").append(toIndentedString(currency)).append("\n");
sb.append(" discardedBy: ").append(toIndentedString(discardedBy)).append("\n");
sb.append(" discardedOn: ").append(toIndentedString(discardedOn)).append("\n");
sb.append(" environment: ").append(toIndentedString(environment)).append("\n");
sb.append(" familyName: ").append(toIndentedString(familyName)).append("\n");
sb.append(" givenName: ").append(toIndentedString(givenName)).append("\n");
sb.append(" iban: ").append(toIndentedString(iban)).append("\n");
Expand All @@ -518,7 +535,7 @@ public String toString() {
sb.append(" senderBankAccount: ").append(toIndentedString(senderBankAccount)).append("\n");
sb.append(" state: ").append(toIndentedString(state)).append("\n");
sb.append(" street: ").append(toIndentedString(street)).append("\n");
sb.append(" transaction: ").append(toIndentedString(transaction)).append("\n");
sb.append(" type: ").append(toIndentedString(type)).append("\n");
sb.append(" uniqueId: ").append(toIndentedString(uniqueId)).append("\n");
sb.append(" valueDate: ").append(toIndentedString(valueDate)).append("\n");
sb.append(" version: ").append(toIndentedString(version)).append("\n");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@

import java.util.Objects;
import java.util.Arrays;
import ch.postfinance.sdk.model.LineItemCreate;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.time.OffsetDateTime;

Expand All @@ -37,60 +37,48 @@
*/
@ApiModel(description = "")

public class TransactionLineItemUpdateRequest {
public class InvoiceReconciliationRecordType {

@JsonProperty("newLineItems")
protected List<LineItemCreate> newLineItems = null;
@JsonProperty("description")
protected Map<String, String> description = null;


@JsonProperty("transactionId")
protected Long transactionId = null;
@JsonProperty("id")
protected Long id = null;



public TransactionLineItemUpdateRequest newLineItems(List<LineItemCreate> newLineItems) {
this.newLineItems = newLineItems;
return this;
}

public TransactionLineItemUpdateRequest addNewLineItemsItem(LineItemCreate newLineItemsItem) {
if (this.newLineItems == null) {
this.newLineItems = new ArrayList<>();
}
this.newLineItems.add(newLineItemsItem);
return this;
}
@JsonProperty("name")
protected Map<String, String> name = null;



/**
*
* @return newLineItems
* @return description
**/
@ApiModelProperty(value = "")
public List<LineItemCreate> getNewLineItems() {
return newLineItems;
}

public void setNewLineItems(List<LineItemCreate> newLineItems) {
this.newLineItems = newLineItems;
public Map<String, String> getDescription() {
return description;
}


public TransactionLineItemUpdateRequest transactionId(Long transactionId) {
this.transactionId = transactionId;
return this;
/**
* The ID is the primary key of the entity. The ID identifies the entity uniquely.
* @return id
**/
@ApiModelProperty(value = "The ID is the primary key of the entity. The ID identifies the entity uniquely.")
public Long getId() {
return id;
}


/**
*
* @return transactionId
* @return name
**/
@ApiModelProperty(required = true, value = "")
public Long getTransactionId() {
return transactionId;
}

public void setTransactionId(Long transactionId) {
this.transactionId = transactionId;
@ApiModelProperty(value = "")
public Map<String, String> getName() {
return name;
}


Expand All @@ -103,24 +91,26 @@ public boolean equals(java.lang.Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
TransactionLineItemUpdateRequest transactionLineItemUpdateRequest = (TransactionLineItemUpdateRequest) o;
return Objects.equals(this.newLineItems, transactionLineItemUpdateRequest.newLineItems) &&
Objects.equals(this.transactionId, transactionLineItemUpdateRequest.transactionId);
InvoiceReconciliationRecordType invoiceReconciliationRecordType = (InvoiceReconciliationRecordType) o;
return Objects.equals(this.description, invoiceReconciliationRecordType.description) &&
Objects.equals(this.id, invoiceReconciliationRecordType.id) &&
Objects.equals(this.name, invoiceReconciliationRecordType.name);
}

@Override
public int hashCode() {
return Objects.hash(newLineItems, transactionId);
return Objects.hash(description, id, name);
}


@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class TransactionLineItemUpdateRequest {\n");
sb.append("class InvoiceReconciliationRecordType {\n");

sb.append(" newLineItems: ").append(toIndentedString(newLineItems)).append("\n");
sb.append(" transactionId: ").append(toIndentedString(transactionId)).append("\n");
sb.append(" description: ").append(toIndentedString(description)).append("\n");
sb.append(" id: ").append(toIndentedString(id)).append("\n");
sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
Loading

0 comments on commit 05bd18c

Please sign in to comment.