Release 6.1.0

wallee-payment · Oct 16, 2023 · 64e9e4f · 64e9e4f
1 parent 75ae5f5
commit 64e9e4f
Show file tree

Hide file tree

Showing 10 changed files with 100 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.wallee</groupId>
     <artifactId>wallee-java-sdk</artifactId>
-    <version>6.0.3</version>
+    <version>6.1.0</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.wallee:wallee-java-sdk:6.0.3"
+compile "com.wallee:wallee-java-sdk:6.1.0"
 ```
 
 ### Others
@@ -46,7 +46,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/wallee-java-sdk-6.0.3.jar`
+* `target/wallee-java-sdk-6.1.0.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.wallee'
-version = '6.0.3'
+version = '6.1.0'
 
 buildscript {
     repositories {
@@ -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"
 }
diff --git a/build.sbt b/build.sbt
@@ -2,20 +2,21 @@ lazy val root = (project in file(".")).
   settings(
     organization := "com.wallee",
     name := "wallee-java-sdk",
-    version := "6.0.3",
+    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"

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>wallee-java-sdk</artifactId>
     <packaging>jar</packaging>
     <name>wallee-java-sdk</name>
-    <version>6.0.3</version>
+    <version>6.1.0</version>
     <url>https://www.wallee.com</url>
     <description>The SDK for simplifying the integration with wallee API.</description>
     <scm>
@@ -22,16 +22,6 @@
         </license>
     </licenses>
 
-    <developers>
-        <developer>
-            <id>adamovic</id>
-            <name>Slobodan Adamovic</name>
-            <email>[email protected]</email>
-            <organization>customweb GmbH</organization>
-            <organizationUrl>https://www.customweb.com</organizationUrl>
-        </developer>
-    </developers>
-
     <distributionManagement>
         <snapshotRepository>
             <id>ossrh</id>
@@ -275,12 +265,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>
@@ -315,7 +322,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>

diff --git a/src/main/java/com/wallee/sdk/DefaultHeaders.java b/src/main/java/com/wallee/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", "6.0.3");
+        headers.put("x-meta-sdk-version", "6.1.0");
         headers.put("x-meta-sdk-language", "java");
         headers.put("x-meta-sdk-provider", "wallee");
         headers.put("x-meta-sdk-language-version", System.getProperty("java.version"));

diff --git a/src/main/java/com/wallee/sdk/model/AbstractPaymentLinkUpdate.java b/src/main/java/com/wallee/sdk/model/AbstractPaymentLinkUpdate.java
@@ -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;
   }

diff --git a/src/main/java/com/wallee/sdk/model/CardAuthenticationResponse.java b/src/main/java/com/wallee/sdk/model/CardAuthenticationResponse.java
@@ -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;
 

diff --git a/src/main/java/com/wallee/sdk/model/PaymentLink.java b/src/main/java/com/wallee/sdk/model/PaymentLink.java
@@ -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;
   }

diff --git a/src/main/java/com/wallee/sdk/model/PaymentLinkUpdate.java b/src/main/java/com/wallee/sdk/model/PaymentLinkUpdate.java
@@ -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;
   }

diff --git a/src/main/java/com/wallee/sdk/model/SubscriptionComponentConfiguration.java b/src/main/java/com/wallee/sdk/model/SubscriptionComponentConfiguration.java
@@ -41,10 +41,22 @@ public class SubscriptionComponentConfiguration {
   protected Long component = null;
 
 
+  @JsonProperty("id")
+  protected Long id = null;
+
+
+  @JsonProperty("linkedSpaceId")
+  protected Long linkedSpaceId = null;
+
+
   @JsonProperty("quantity")
   protected BigDecimal quantity = null;
 
 
+  @JsonProperty("version")
+  protected Integer version = null;
+
+
 
    /**
    * 
@@ -56,6 +68,26 @@ public Long getComponent() {
   }
 
 
+   /**
+   * A unique identifier for the object.
+   * @return id
+  **/
+  @ApiModelProperty(value = "A unique identifier for the object.")
+  public Long getId() {
+    return id;
+  }
+
+
+   /**
+   * The ID of the space this object belongs to.
+   * @return linkedSpaceId
+  **/
+  @ApiModelProperty(value = "The ID of the space this object belongs to.")
+  public Long getLinkedSpaceId() {
+    return linkedSpaceId;
+  }
+
+
    /**
    * 
    * @return quantity
@@ -66,6 +98,16 @@ public BigDecimal getQuantity() {
   }
 
 
+   /**
+   * The version is used for optimistic locking and incremented whenever the object is updated.
+   * @return version
+  **/
+  @ApiModelProperty(value = "The version is used for optimistic locking and incremented whenever the object is updated.")
+  public Integer getVersion() {
+    return version;
+  }
+
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -77,12 +119,15 @@ public boolean equals(java.lang.Object o) {
     }
     SubscriptionComponentConfiguration subscriptionComponentConfiguration = (SubscriptionComponentConfiguration) o;
     return Objects.equals(this.component, subscriptionComponentConfiguration.component) &&
-        Objects.equals(this.quantity, subscriptionComponentConfiguration.quantity);
+        Objects.equals(this.id, subscriptionComponentConfiguration.id) &&
+        Objects.equals(this.linkedSpaceId, subscriptionComponentConfiguration.linkedSpaceId) &&
+        Objects.equals(this.quantity, subscriptionComponentConfiguration.quantity) &&
+        Objects.equals(this.version, subscriptionComponentConfiguration.version);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(component, quantity);
+    return Objects.hash(component, id, linkedSpaceId, quantity, version);
   }
 
 
@@ -92,7 +137,10 @@ public String toString() {
     sb.append("class SubscriptionComponentConfiguration {\n");
 
     sb.append("    component: ").append(toIndentedString(component)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    linkedSpaceId: ").append(toIndentedString(linkedSpaceId)).append("\n");
     sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
+    sb.append("    version: ").append(toIndentedString(version)).append("\n");
     sb.append("}");
     return sb.toString();
   }