Skip to content

Commit 05bd18c

Browse files
Release 4.0.3
1 parent 12b0d1f commit 05bd18c

24 files changed

+3265
-121
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Add this dependency to your project's POM:
2323
<dependency>
2424
<groupId>ch.postfinance</groupId>
2525
<artifactId>postfinancecheckout-java-sdk</artifactId>
26-
<version>4.1.3</version>
26+
<version>4.0.3</version>
2727
<scope>compile</scope>
2828
</dependency>
2929
```
@@ -33,7 +33,7 @@ Add this dependency to your project's POM:
3333
Add this dependency to your project's build file:
3434

3535
```groovy
36-
compile "ch.postfinance:postfinancecheckout-java-sdk:4.1.3"
36+
compile "ch.postfinance:postfinancecheckout-java-sdk:4.0.3"
3737
```
3838

3939
### Others
@@ -46,7 +46,7 @@ mvn clean package
4646

4747
Then manually install the following JARs:
4848

49-
* `target/postfinancecheckout-java-sdk-4.1.3.jar`
49+
* `target/postfinancecheckout-java-sdk-4.0.3.jar`
5050
* `target/lib/*.jar`
5151

5252
## Usage

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'idea'
22
apply plugin: 'eclipse'
33

44
group = 'ch.postfinance'
5-
version = '4.1.3'
5+
version = '4.0.3'
66

77
buildscript {
88
repositories {

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
22
settings(
33
organization := "ch.postfinance",
44
name := "postfinancecheckout-java-sdk",
5-
version := "4.1.3",
5+
version := "4.0.3",
66
scalaVersion := "2.11.4",
77
scalacOptions ++= Seq("-feature"),
88
javacOptions in compile ++= Seq("-Xlint:deprecation"),

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>postfinancecheckout-java-sdk</artifactId>
66
<packaging>jar</packaging>
77
<name>postfinancecheckout-java-sdk</name>
8-
<version>4.1.3</version>
8+
<version>4.0.3</version>
99
<url>https://www.postfinance.ch/checkout</url>
1010
<description>The SDK for simplifying the integration with PostFinance Checkout API.</description>
1111
<scm>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,14 @@ public InvoiceReconciliationRecordService getInvoiceReconciliationRecordService(
301301
return this.invoiceReconciliationRecordService;
302302
}
303303

304+
private InvoiceReimbursementService invoiceReimbursementService;
305+
public InvoiceReimbursementService getInvoiceReimbursementService() {
306+
if (this.invoiceReimbursementService == null) {
307+
this.invoiceReimbursementService = new InvoiceReimbursementService(this);
308+
}
309+
return this.invoiceReimbursementService;
310+
}
311+
304312
private LabelDescriptionGroupService labelDescriptionGroupService;
305313
public LabelDescriptionGroupService getLabelDescriptionGroupService() {
306314
if (this.labelDescriptionGroupService == null) {
@@ -421,6 +429,14 @@ public PaymentTerminalTillService getPaymentTerminalTillService() {
421429
return this.paymentTerminalTillService;
422430
}
423431

432+
private PaymentTerminalTransactionSummaryService paymentTerminalTransactionSummaryService;
433+
public PaymentTerminalTransactionSummaryService getPaymentTerminalTransactionSummaryService() {
434+
if (this.paymentTerminalTransactionSummaryService == null) {
435+
this.paymentTerminalTransactionSummaryService = new PaymentTerminalTransactionSummaryService(this);
436+
}
437+
return this.paymentTerminalTransactionSummaryService;
438+
}
439+
424440
private PermissionService permissionService;
425441
public PermissionService getPermissionService() {
426442
if (this.permissionService == null) {

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import ch.postfinance.sdk.model.ChargeAttemptEnvironment;
2626
import ch.postfinance.sdk.model.ChargeAttemptState;
2727
import ch.postfinance.sdk.model.ConnectorInvocation;
28+
import ch.postfinance.sdk.model.CustomersPresence;
2829
import ch.postfinance.sdk.model.FailureReason;
2930
import ch.postfinance.sdk.model.Label;
3031
import ch.postfinance.sdk.model.PaymentConnectorConfiguration;
@@ -66,6 +67,10 @@ public class ChargeAttempt extends TransactionAwareEntity {
6667
protected OffsetDateTime createdOn = null;
6768

6869

70+
@JsonProperty("customersPresence")
71+
protected CustomersPresence customersPresence = null;
72+
73+
6974
@JsonProperty("environment")
7075
protected ChargeAttemptEnvironment environment = null;
7176

@@ -187,6 +192,16 @@ public OffsetDateTime getCreatedOn() {
187192
}
188193

189194

195+
/**
196+
* The customers presence indicates which kind of customer interaction was used during the charge attempt.
197+
* @return customersPresence
198+
**/
199+
@ApiModelProperty(value = "The customers presence indicates which kind of customer interaction was used during the charge attempt.")
200+
public CustomersPresence getCustomersPresence() {
201+
return customersPresence;
202+
}
203+
204+
190205
/**
191206
*
192207
* @return environment
@@ -404,6 +419,7 @@ public boolean equals(java.lang.Object o) {
404419
Objects.equals(this.completionBehavior, chargeAttempt.completionBehavior) &&
405420
Objects.equals(this.connectorConfiguration, chargeAttempt.connectorConfiguration) &&
406421
Objects.equals(this.createdOn, chargeAttempt.createdOn) &&
422+
Objects.equals(this.customersPresence, chargeAttempt.customersPresence) &&
407423
Objects.equals(this.environment, chargeAttempt.environment) &&
408424
Objects.equals(this.failedOn, chargeAttempt.failedOn) &&
409425
Objects.equals(this.failureReason, chargeAttempt.failureReason) &&
@@ -429,7 +445,7 @@ public boolean equals(java.lang.Object o) {
429445

430446
@Override
431447
public int hashCode() {
432-
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());
448+
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());
433449
}
434450

435451

@@ -445,6 +461,7 @@ public String toString() {
445461
sb.append(" completionBehavior: ").append(toIndentedString(completionBehavior)).append("\n");
446462
sb.append(" connectorConfiguration: ").append(toIndentedString(connectorConfiguration)).append("\n");
447463
sb.append(" createdOn: ").append(toIndentedString(createdOn)).append("\n");
464+
sb.append(" customersPresence: ").append(toIndentedString(customersPresence)).append("\n");
448465
sb.append(" environment: ").append(toIndentedString(environment)).append("\n");
449466
sb.append(" failedOn: ").append(toIndentedString(failedOn)).append("\n");
450467
sb.append(" failureReason: ").append(toIndentedString(failureReason)).append("\n");

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

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121

2222
import java.util.Objects;
2323
import java.util.Arrays;
24+
import ch.postfinance.sdk.model.ChargeAttemptEnvironment;
2425
import ch.postfinance.sdk.model.FailureReason;
2526
import ch.postfinance.sdk.model.InvoiceReconciliationRecordRejectionStatus;
2627
import ch.postfinance.sdk.model.InvoiceReconciliationRecordState;
27-
import ch.postfinance.sdk.model.Transaction;
28+
import ch.postfinance.sdk.model.InvoiceReconciliationRecordType;
2829
import ch.postfinance.sdk.model.TransactionAwareEntity;
2930
import com.fasterxml.jackson.annotation.JsonProperty;
3031
import com.fasterxml.jackson.annotation.JsonCreator;
@@ -75,6 +76,10 @@ public class InvoiceReconciliationRecord extends TransactionAwareEntity {
7576
protected OffsetDateTime discardedOn = null;
7677

7778

79+
@JsonProperty("environment")
80+
protected ChargeAttemptEnvironment environment = null;
81+
82+
7883
@JsonProperty("familyName")
7984
protected String familyName = null;
8085

@@ -139,8 +144,8 @@ public class InvoiceReconciliationRecord extends TransactionAwareEntity {
139144
protected String street = null;
140145

141146

142-
@JsonProperty("transaction")
143-
protected Transaction transaction = null;
147+
@JsonProperty("type")
148+
protected InvoiceReconciliationRecordType type = null;
144149

145150

146151
@JsonProperty("uniqueId")
@@ -236,6 +241,16 @@ public OffsetDateTime getDiscardedOn() {
236241
}
237242

238243

244+
/**
245+
*
246+
* @return environment
247+
**/
248+
@ApiModelProperty(value = "")
249+
public ChargeAttemptEnvironment getEnvironment() {
250+
return environment;
251+
}
252+
253+
239254
/**
240255
*
241256
* @return familyName
@@ -398,11 +413,11 @@ public String getStreet() {
398413

399414
/**
400415
*
401-
* @return transaction
416+
* @return type
402417
**/
403418
@ApiModelProperty(value = "")
404-
public Transaction getTransaction() {
405-
return transaction;
419+
public InvoiceReconciliationRecordType getType() {
420+
return type;
406421
}
407422

408423

@@ -457,6 +472,7 @@ public boolean equals(java.lang.Object o) {
457472
Objects.equals(this.currency, invoiceReconciliationRecord.currency) &&
458473
Objects.equals(this.discardedBy, invoiceReconciliationRecord.discardedBy) &&
459474
Objects.equals(this.discardedOn, invoiceReconciliationRecord.discardedOn) &&
475+
Objects.equals(this.environment, invoiceReconciliationRecord.environment) &&
460476
Objects.equals(this.familyName, invoiceReconciliationRecord.familyName) &&
461477
Objects.equals(this.givenName, invoiceReconciliationRecord.givenName) &&
462478
Objects.equals(this.iban, invoiceReconciliationRecord.iban) &&
@@ -473,7 +489,7 @@ public boolean equals(java.lang.Object o) {
473489
Objects.equals(this.senderBankAccount, invoiceReconciliationRecord.senderBankAccount) &&
474490
Objects.equals(this.state, invoiceReconciliationRecord.state) &&
475491
Objects.equals(this.street, invoiceReconciliationRecord.street) &&
476-
Objects.equals(this.transaction, invoiceReconciliationRecord.transaction) &&
492+
Objects.equals(this.type, invoiceReconciliationRecord.type) &&
477493
Objects.equals(this.uniqueId, invoiceReconciliationRecord.uniqueId) &&
478494
Objects.equals(this.valueDate, invoiceReconciliationRecord.valueDate) &&
479495
Objects.equals(this.version, invoiceReconciliationRecord.version) &&
@@ -482,7 +498,7 @@ public boolean equals(java.lang.Object o) {
482498

483499
@Override
484500
public int hashCode() {
485-
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());
501+
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());
486502
}
487503

488504

@@ -502,6 +518,7 @@ public String toString() {
502518
sb.append(" currency: ").append(toIndentedString(currency)).append("\n");
503519
sb.append(" discardedBy: ").append(toIndentedString(discardedBy)).append("\n");
504520
sb.append(" discardedOn: ").append(toIndentedString(discardedOn)).append("\n");
521+
sb.append(" environment: ").append(toIndentedString(environment)).append("\n");
505522
sb.append(" familyName: ").append(toIndentedString(familyName)).append("\n");
506523
sb.append(" givenName: ").append(toIndentedString(givenName)).append("\n");
507524
sb.append(" iban: ").append(toIndentedString(iban)).append("\n");
@@ -518,7 +535,7 @@ public String toString() {
518535
sb.append(" senderBankAccount: ").append(toIndentedString(senderBankAccount)).append("\n");
519536
sb.append(" state: ").append(toIndentedString(state)).append("\n");
520537
sb.append(" street: ").append(toIndentedString(street)).append("\n");
521-
sb.append(" transaction: ").append(toIndentedString(transaction)).append("\n");
538+
sb.append(" type: ").append(toIndentedString(type)).append("\n");
522539
sb.append(" uniqueId: ").append(toIndentedString(uniqueId)).append("\n");
523540
sb.append(" valueDate: ").append(toIndentedString(valueDate)).append("\n");
524541
sb.append(" version: ").append(toIndentedString(version)).append("\n");

src/main/java/ch/postfinance/sdk/model/TransactionLineItemUpdateRequest.java renamed to src/main/java/ch/postfinance/sdk/model/InvoiceReconciliationRecordType.java

Lines changed: 35 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121

2222
import java.util.Objects;
2323
import java.util.Arrays;
24-
import ch.postfinance.sdk.model.LineItemCreate;
2524
import com.fasterxml.jackson.annotation.JsonProperty;
2625
import com.fasterxml.jackson.annotation.JsonCreator;
2726
import com.fasterxml.jackson.annotation.JsonValue;
2827
import io.swagger.annotations.ApiModel;
2928
import io.swagger.annotations.ApiModelProperty;
30-
import java.util.ArrayList;
29+
import java.util.HashMap;
3130
import java.util.List;
31+
import java.util.Map;
3232
import java.util.*;
3333
import java.time.OffsetDateTime;
3434

@@ -37,60 +37,48 @@
3737
*/
3838
@ApiModel(description = "")
3939

40-
public class TransactionLineItemUpdateRequest {
40+
public class InvoiceReconciliationRecordType {
4141

42-
@JsonProperty("newLineItems")
43-
protected List<LineItemCreate> newLineItems = null;
42+
@JsonProperty("description")
43+
protected Map<String, String> description = null;
4444

4545

46-
@JsonProperty("transactionId")
47-
protected Long transactionId = null;
46+
@JsonProperty("id")
47+
protected Long id = null;
4848

4949

50-
51-
public TransactionLineItemUpdateRequest newLineItems(List<LineItemCreate> newLineItems) {
52-
this.newLineItems = newLineItems;
53-
return this;
54-
}
55-
56-
public TransactionLineItemUpdateRequest addNewLineItemsItem(LineItemCreate newLineItemsItem) {
57-
if (this.newLineItems == null) {
58-
this.newLineItems = new ArrayList<>();
59-
}
60-
this.newLineItems.add(newLineItemsItem);
61-
return this;
62-
}
50+
@JsonProperty("name")
51+
protected Map<String, String> name = null;
6352

53+
54+
6455
/**
6556
*
66-
* @return newLineItems
57+
* @return description
6758
**/
6859
@ApiModelProperty(value = "")
69-
public List<LineItemCreate> getNewLineItems() {
70-
return newLineItems;
71-
}
72-
73-
public void setNewLineItems(List<LineItemCreate> newLineItems) {
74-
this.newLineItems = newLineItems;
60+
public Map<String, String> getDescription() {
61+
return description;
7562
}
7663

7764

78-
public TransactionLineItemUpdateRequest transactionId(Long transactionId) {
79-
this.transactionId = transactionId;
80-
return this;
65+
/**
66+
* The ID is the primary key of the entity. The ID identifies the entity uniquely.
67+
* @return id
68+
**/
69+
@ApiModelProperty(value = "The ID is the primary key of the entity. The ID identifies the entity uniquely.")
70+
public Long getId() {
71+
return id;
8172
}
8273

74+
8375
/**
8476
*
85-
* @return transactionId
77+
* @return name
8678
**/
87-
@ApiModelProperty(required = true, value = "")
88-
public Long getTransactionId() {
89-
return transactionId;
90-
}
91-
92-
public void setTransactionId(Long transactionId) {
93-
this.transactionId = transactionId;
79+
@ApiModelProperty(value = "")
80+
public Map<String, String> getName() {
81+
return name;
9482
}
9583

9684

@@ -103,24 +91,26 @@ public boolean equals(java.lang.Object o) {
10391
if (o == null || getClass() != o.getClass()) {
10492
return false;
10593
}
106-
TransactionLineItemUpdateRequest transactionLineItemUpdateRequest = (TransactionLineItemUpdateRequest) o;
107-
return Objects.equals(this.newLineItems, transactionLineItemUpdateRequest.newLineItems) &&
108-
Objects.equals(this.transactionId, transactionLineItemUpdateRequest.transactionId);
94+
InvoiceReconciliationRecordType invoiceReconciliationRecordType = (InvoiceReconciliationRecordType) o;
95+
return Objects.equals(this.description, invoiceReconciliationRecordType.description) &&
96+
Objects.equals(this.id, invoiceReconciliationRecordType.id) &&
97+
Objects.equals(this.name, invoiceReconciliationRecordType.name);
10998
}
11099

111100
@Override
112101
public int hashCode() {
113-
return Objects.hash(newLineItems, transactionId);
102+
return Objects.hash(description, id, name);
114103
}
115104

116105

117106
@Override
118107
public String toString() {
119108
StringBuilder sb = new StringBuilder();
120-
sb.append("class TransactionLineItemUpdateRequest {\n");
109+
sb.append("class InvoiceReconciliationRecordType {\n");
121110

122-
sb.append(" newLineItems: ").append(toIndentedString(newLineItems)).append("\n");
123-
sb.append(" transactionId: ").append(toIndentedString(transactionId)).append("\n");
111+
sb.append(" description: ").append(toIndentedString(description)).append("\n");
112+
sb.append(" id: ").append(toIndentedString(id)).append("\n");
113+
sb.append(" name: ").append(toIndentedString(name)).append("\n");
124114
sb.append("}");
125115
return sb.toString();
126116
}

0 commit comments

Comments
 (0)