Skip to content

Commit

Permalink
Release 6.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
wallee-deployment-user committed Oct 16, 2023
1 parent 87b51ef commit de89c82
Show file tree
Hide file tree
Showing 14 changed files with 690 additions and 36 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path

name: Maven Package
on: push
on:
release:
types: [published]

jobs:
build:
Expand Down
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>6.0.1</version>
<version>6.1.0</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:6.0.1"
compile "ch.postfinance:postfinancecheckout-java-sdk:6.1.0"
```

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

Then manually install the following JARs:

* `target/postfinancecheckout-java-sdk-6.0.1.jar`
* `target/postfinancecheckout-java-sdk-6.1.0.jar`
* `target/lib/*.jar`

## Usage
Expand Down
14 changes: 10 additions & 4 deletions 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 = '6.0.1'
version = '6.1.0'

buildscript {
repositories {
Expand Down Expand Up @@ -96,20 +96,26 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.5.17"
jackson_version = "2.14.1"
google_api_client_version = "1.23.0"
google_api_client_version = "2.2.0"
guava_version = "32.1.2-jre"
jodatime_version = "2.9.9"
junit_version = "4.13.2"
httpclient_version = "4.5.14"
}

dependencies {
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "com.google.api-client:google-api-client:${google_api_client_version}"
compile "com.google.api-client:google-api-client:${google_api_client_version}" {
exclude group: 'commons-codec', module: 'commons-codec'
}
compile "com.google.guava:guava:$guava_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.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
compile "org.apache.httpcomponents:httpclient:$httpclient_version"
compile("org.apache.httpcomponents:httpclient:$httpclient_version") {
exclude group: 'commons-codec', module: 'commons-codec'
}
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
testCompile "junit:junit:$junit_version"
}
9 changes: 5 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@ lazy val root = (project in file(".")).
settings(
organization := "ch.postfinance",
name := "postfinancecheckout-java-sdk",
version := "6.0.1",
version := "6.1.0",
scalaVersion := "2.11.4",
scalacOptions ++= Seq("-feature"),
javacOptions in compile ++= Seq("-Xlint:deprecation"),
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
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.34",
"com.google.api-client" % "google-api-client" % "2.2.0" "compile" exclude("com.google.guava", "guava"),
"com.google.guava" % "guava" % "32.1.2-jre" "compile",
"org.glassfish.jersey.core" % "jersey-common" % "2.34" "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.14.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.14.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.14.1" % "compile",
"org.apache.httpcomponents" % "httpclient" % "4.5.14" % "compile",
"org.apache.httpcomponents" % "httpclient" % "4.5.14" % "compile" exclude("commons-codec", "commons-codec"),
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.14.1" % "compile",
"junit" % "junit" % "4.13.2" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test"
Expand Down
32 changes: 20 additions & 12 deletions 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>6.0.1</version>
<version>6.1.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>
Expand All @@ -22,16 +22,6 @@
</license>
</licenses>

<developers>
<developer>
<id>adamovic</id>
<name>Slobodan Adamovic</name>
<email>slobodan.adamovic@customweb.com</email>
<organization>customweb GmbH</organization>
<organizationUrl>https://www.customweb.com</organizationUrl>
</developer>
</developers>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
Expand Down Expand Up @@ -316,12 +306,29 @@
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client</artifactId>
<version>${google-api-client-version}</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava-version}</version>
</dependency>
<!-- Apache HttpClient for building URLs from templates -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${apache-httpclient-version}</version>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- JSON processing: jackson -->
<dependency>
Expand Down Expand Up @@ -356,7 +363,8 @@
<properties>
<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>
<google-api-client-version>2.2.0</google-api-client-version>
<guava-version>32.1.2-jre</guava-version>
<jackson-version>2.14.1</jackson-version>
<apache-httpclient-version>4.5.14</apache-httpclient-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/ch/postfinance/sdk/ApiClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,14 @@ public UserSpaceRoleService getUserSpaceRoleService() {
return this.userSpaceRoleService;
}

private WebAppService webAppService;
public WebAppService getWebAppService() {
if (this.webAppService == null) {
this.webAppService = new WebAppService(this);
}
return this.webAppService;
}

private WebhookListenerService webhookListenerService;
public WebhookListenerService getWebhookListenerService() {
if (this.webhookListenerService == null) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/postfinance/sdk/DefaultHeaders.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void intercept(HttpRequest request) throws IOException {

private HttpHeaders getDefaultHeaders() {
HttpHeaders headers = new HttpHeaders();
headers.put("x-meta-sdk-version", "6.0.1");
headers.put("x-meta-sdk-version", "6.1.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"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@ public AbstractPaymentLinkUpdate addLineItemsItem(LineItemCreate lineItemsItem)
}

/**
* The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters.
* The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters. If no amount for the payment link is defined, the additional checkout page to enter the amount is shown to the consumer.
* @return lineItems
**/
@ApiModelProperty(value = "The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters.")
@ApiModelProperty(value = "The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters. If no amount for the payment link is defined, the additional checkout page to enter the amount is shown to the consumer.")
public List<LineItemCreate> getLineItems() {
return lineItems;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
*/
public enum CardAuthenticationResponse {

ENROLLMENT_VERIFICATION_ERROR("ENROLLMENT_VERIFICATION_ERROR"),
FULLY_AUTHENTICATED("FULLY_AUTHENTICATED"),

NOT_ENROLLED("NOT_ENROLLED"),
AUTHENTICATION_NOT_REQUIRED("AUTHENTICATION_NOT_REQUIRED"),

AUTHENTICATION_ERROR("AUTHENTICATION_ERROR"),
NOT_ENROLLED("NOT_ENROLLED"),

AUTHENTICATION_NOT_REQUIRED("AUTHENTICATION_NOT_REQUIRED"),
ENROLLMENT_ERROR("ENROLLMENT_ERROR"),

FULLY_AUTHENTICATED("FULLY_AUTHENTICATED");
AUTHENTICATION_ERROR("AUTHENTICATION_ERROR");

private String value;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ch/postfinance/sdk/model/PaymentLink.java
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,10 @@ public String getLanguage() {


/**
* The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters.
* The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters. If no amount for the payment link is defined, the additional checkout page to enter the amount is shown to the consumer.
* @return lineItems
**/
@ApiModelProperty(value = "The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters.")
@ApiModelProperty(value = "The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters. If no amount for the payment link is defined, the additional checkout page to enter the amount is shown to the consumer.")
public List<LineItem> getLineItems() {
return lineItems;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ch/postfinance/sdk/model/PaymentLinkUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,10 @@ public PaymentLinkUpdate addLineItemsItem(LineItemCreate lineItemsItem) {
}

/**
* The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters.
* The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters. If no amount for the payment link is defined, the additional checkout page to enter the amount is shown to the consumer.
* @return lineItems
**/
@ApiModelProperty(value = "The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters.")
@ApiModelProperty(value = "The line items allows to define the line items for this payment link. When the line items are defined they cannot be overridden through the request parameters. If no amount for the payment link is defined, the additional checkout page to enter the amount is shown to the consumer.")
public List<LineItemCreate> getLineItems() {
return lineItems;
}
Expand Down
104 changes: 104 additions & 0 deletions src/main/java/ch/postfinance/sdk/model/WebAppConfirmationRequest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/**
* 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.model;

import java.util.Objects;
import java.util.Arrays;
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.*;
import java.time.OffsetDateTime;

/**
*
*/
@ApiModel(description = "")

public class WebAppConfirmationRequest {

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



public WebAppConfirmationRequest code(String code) {
this.code = code;
return this;
}

/**
* The user returns to the web app after granting the permission. The HTTP request contains the code. Provide it here to confirm the web app installation.
* @return code
**/
@ApiModelProperty(value = "The user returns to the web app after granting the permission. The HTTP request contains the code. Provide it here to confirm the web app installation.")
public String getCode() {
return code;
}

public void setCode(String code) {
this.code = code;
}



@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
WebAppConfirmationRequest webAppConfirmationRequest = (WebAppConfirmationRequest) o;
return Objects.equals(this.code, webAppConfirmationRequest.code);
}

@Override
public int hashCode() {
return Objects.hash(code);
}


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

sb.append(" code: ").append(toIndentedString(code)).append("\n");
sb.append("}");
return sb.toString();
}

/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}

}

Loading

0 comments on commit de89c82

Please sign in to comment.