Release 2.2.2

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>2.2.1</version>
+    <version>2.2.2</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:2.2.1"
+compile "com.wallee:wallee-java-sdk:2.2.2"
 ```
 
 ### Others
@@ -46,7 +46,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/wallee-java-sdk-2.2.1.jar`
+* `target/wallee-java-sdk-2.2.2.jar`
 * `target/lib/*.jar`
 
 ## Usage

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.wallee'
-version = '2.2.1'
+version = '2.2.2'
 
 buildscript {
     repositories {

build.sbt

@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
   settings(
     organization := "com.wallee",
     name := "wallee-java-sdk",
-    version := "2.2.1",
+    version := "2.2.2",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>wallee-java-sdk</artifactId>
     <packaging>jar</packaging>
     <name>wallee-java-sdk</name>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
     <url>https://www.wallee.com</url>
     <description>The SDK for simplifying the integration with wallee API.</description>
     <scm>

src/main/java/com/wallee/sdk/ApiClient.java

@@ -492,6 +492,14 @@ public ShopifySubscriptionVersionService getShopifySubscriptionVersionService()
         return this.shopifySubscriptionVersionService;
     }
 
+    private ShopifyTransactionService shopifyTransactionService;
+    public ShopifyTransactionService getShopifyTransactionService() {
+        if (this.shopifyTransactionService == null) {
+            this.shopifyTransactionService = new ShopifyTransactionService(this);
+        }
+        return this.shopifyTransactionService;
+    }
+
     private SpaceService spaceService;
     public SpaceService getSpaceService() {
         if (this.spaceService == null) {

src/main/java/com/wallee/sdk/model/PaymentTerminalContactAddress.java

@@ -0,0 +1,109 @@
+/**
+*  SDK
+*
+* This library allows to interact with the  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 com.wallee.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 com.wallee.sdk.model.PaymentTerminalAddress;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.*;
+import java.time.OffsetDateTime;
+
+/**
+ * 
+ */
+@ApiModel(description = "")
+
+public class PaymentTerminalContactAddress extends PaymentTerminalAddress {
+
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    PaymentTerminalContactAddress paymentTerminalContactAddress = (PaymentTerminalContactAddress) o;
+    return Objects.equals(this.city, paymentTerminalContactAddress.city) &&
+        Objects.equals(this.country, paymentTerminalContactAddress.country) &&
+        Objects.equals(this.dependentLocality, paymentTerminalContactAddress.dependentLocality) &&
+        Objects.equals(this.emailAddress, paymentTerminalContactAddress.emailAddress) &&
+        Objects.equals(this.familyName, paymentTerminalContactAddress.familyName) &&
+        Objects.equals(this.givenName, paymentTerminalContactAddress.givenName) &&
+        Objects.equals(this.mobilePhoneNumber, paymentTerminalContactAddress.mobilePhoneNumber) &&
+        Objects.equals(this.organizationName, paymentTerminalContactAddress.organizationName) &&
+        Objects.equals(this.phoneNumber, paymentTerminalContactAddress.phoneNumber) &&
+        Objects.equals(this.postalState, paymentTerminalContactAddress.postalState) &&
+        Objects.equals(this.postcode, paymentTerminalContactAddress.postcode) &&
+        Objects.equals(this.salutation, paymentTerminalContactAddress.salutation) &&
+        Objects.equals(this.sortingCode, paymentTerminalContactAddress.sortingCode) &&
+        Objects.equals(this.street, paymentTerminalContactAddress.street) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(city, country, dependentLocality, emailAddress, familyName, givenName, mobilePhoneNumber, organizationName, phoneNumber, postalState, postcode, salutation, sortingCode, street, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class PaymentTerminalContactAddress {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    city: ").append(toIndentedString(city)).append("\n");
+    sb.append("    country: ").append(toIndentedString(country)).append("\n");
+    sb.append("    dependentLocality: ").append(toIndentedString(dependentLocality)).append("\n");
+    sb.append("    emailAddress: ").append(toIndentedString(emailAddress)).append("\n");
+    sb.append("    familyName: ").append(toIndentedString(familyName)).append("\n");
+    sb.append("    givenName: ").append(toIndentedString(givenName)).append("\n");
+    sb.append("    mobilePhoneNumber: ").append(toIndentedString(mobilePhoneNumber)).append("\n");
+    sb.append("    organizationName: ").append(toIndentedString(organizationName)).append("\n");
+    sb.append("    phoneNumber: ").append(toIndentedString(phoneNumber)).append("\n");
+    sb.append("    postalState: ").append(toIndentedString(postalState)).append("\n");
+    sb.append("    postcode: ").append(toIndentedString(postcode)).append("\n");
+    sb.append("    salutation: ").append(toIndentedString(salutation)).append("\n");
+    sb.append("    sortingCode: ").append(toIndentedString(sortingCode)).append("\n");
+    sb.append("    street: ").append(toIndentedString(street)).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    ");
+  }
+
+}
+

src/main/java/com/wallee/sdk/model/PaymentTerminalLocation.java

@@ -26,6 +26,7 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.wallee.sdk.model.PaymentTerminalAddress;
 import com.wallee.sdk.model.PaymentTerminalConfiguration;
+import com.wallee.sdk.model.PaymentTerminalContactAddress;
 import com.wallee.sdk.model.PaymentTerminalLocationState;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -40,6 +41,10 @@
 
 public class PaymentTerminalLocation {
 
+  @JsonProperty("contactAddress")
+  protected PaymentTerminalContactAddress contactAddress = null;
+
+
   @JsonProperty("defaultConfiguration")
   protected PaymentTerminalConfiguration defaultConfiguration = null;
 
@@ -73,6 +78,16 @@ public class PaymentTerminalLocation {
 
 
 
+   /**
+   * 
+   * @return contactAddress
+  **/
+  @ApiModelProperty(value = "")
+  public PaymentTerminalContactAddress getContactAddress() {
+    return contactAddress;
+  }
+
+
    /**
    * 
    * @return defaultConfiguration
@@ -163,7 +178,8 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     PaymentTerminalLocation paymentTerminalLocation = (PaymentTerminalLocation) o;
-    return Objects.equals(this.defaultConfiguration, paymentTerminalLocation.defaultConfiguration) &&
+    return Objects.equals(this.contactAddress, paymentTerminalLocation.contactAddress) &&
+        Objects.equals(this.defaultConfiguration, paymentTerminalLocation.defaultConfiguration) &&
         Objects.equals(this.deliveryAddress, paymentTerminalLocation.deliveryAddress) &&
         Objects.equals(this.id, paymentTerminalLocation.id) &&
         Objects.equals(this.linkedSpaceId, paymentTerminalLocation.linkedSpaceId) &&
@@ -175,7 +191,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(defaultConfiguration, deliveryAddress, id, linkedSpaceId, name, plannedPurgeDate, state, version);
+    return Objects.hash(contactAddress, defaultConfiguration, deliveryAddress, id, linkedSpaceId, name, plannedPurgeDate, state, version);
   }
 
 
@@ -184,6 +200,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class PaymentTerminalLocation {\n");
 
+    sb.append("    contactAddress: ").append(toIndentedString(contactAddress)).append("\n");
     sb.append("    defaultConfiguration: ").append(toIndentedString(defaultConfiguration)).append("\n");
     sb.append("    deliveryAddress: ").append(toIndentedString(deliveryAddress)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");

src/main/java/com/wallee/sdk/model/Refund.java

@@ -153,6 +153,14 @@ public class Refund {
   protected OffsetDateTime timeoutOn = null;
 
 
+  @JsonProperty("totalAppliedFees")
+  protected BigDecimal totalAppliedFees = null;
+
+
+  @JsonProperty("totalSettledAmount")
+  protected BigDecimal totalSettledAmount = null;
+
+
   @JsonProperty("transaction")
   protected Transaction transaction = null;
 
@@ -430,6 +438,26 @@ public OffsetDateTime getTimeoutOn() {
   }
 
 
+   /**
+   * The total applied fees is the sum of all fees that have been applied so far.
+   * @return totalAppliedFees
+  **/
+  @ApiModelProperty(value = "The total applied fees is the sum of all fees that have been applied so far.")
+  public BigDecimal getTotalAppliedFees() {
+    return totalAppliedFees;
+  }
+
+
+   /**
+   * The total settled amount is the total amount which has been settled so far.
+   * @return totalSettledAmount
+  **/
+  @ApiModelProperty(value = "The total settled amount is the total amount which has been settled so far.")
+  public BigDecimal getTotalSettledAmount() {
+    return totalSettledAmount;
+  }
+
+
    /**
    * 
    * @return transaction
@@ -506,6 +534,8 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.taxes, refund.taxes) &&
         Objects.equals(this.timeZone, refund.timeZone) &&
         Objects.equals(this.timeoutOn, refund.timeoutOn) &&
+        Objects.equals(this.totalAppliedFees, refund.totalAppliedFees) &&
+        Objects.equals(this.totalSettledAmount, refund.totalSettledAmount) &&
         Objects.equals(this.transaction, refund.transaction) &&
         Objects.equals(this.type, refund.type) &&
         Objects.equals(this.updatedInvoice, refund.updatedInvoice) &&
@@ -514,7 +544,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(amount, baseLineItems, completion, createdBy, createdOn, environment, externalId, failedOn, failureReason, id, labels, language, lineItems, linkedSpaceId, merchantReference, nextUpdateOn, plannedPurgeDate, processingOn, processorReference, reducedLineItems, reductions, state, succeededOn, taxes, timeZone, timeoutOn, transaction, type, updatedInvoice, version);
+    return Objects.hash(amount, baseLineItems, completion, createdBy, createdOn, environment, externalId, failedOn, failureReason, id, labels, language, lineItems, linkedSpaceId, merchantReference, nextUpdateOn, plannedPurgeDate, processingOn, processorReference, reducedLineItems, reductions, state, succeededOn, taxes, timeZone, timeoutOn, totalAppliedFees, totalSettledAmount, transaction, type, updatedInvoice, version);
   }
 
 
@@ -549,6 +579,8 @@ public String toString() {
     sb.append("    taxes: ").append(toIndentedString(taxes)).append("\n");
     sb.append("    timeZone: ").append(toIndentedString(timeZone)).append("\n");
     sb.append("    timeoutOn: ").append(toIndentedString(timeoutOn)).append("\n");
+    sb.append("    totalAppliedFees: ").append(toIndentedString(totalAppliedFees)).append("\n");
+    sb.append("    totalSettledAmount: ").append(toIndentedString(totalSettledAmount)).append("\n");
     sb.append("    transaction: ").append(toIndentedString(transaction)).append("\n");
     sb.append("    type: ").append(toIndentedString(type)).append("\n");
     sb.append("    updatedInvoice: ").append(toIndentedString(updatedInvoice)).append("\n");

src/main/java/com/wallee/sdk/model/Subscription.java

@@ -105,6 +105,10 @@ public class Subscription {
   protected OffsetDateTime terminatingOn = null;
 
 
+  @JsonProperty("terminationScheduledOn")
+  protected OffsetDateTime terminationScheduledOn = null;
+
+
   @JsonProperty("token")
   protected Token token = null;
 
@@ -274,6 +278,16 @@ public OffsetDateTime getTerminatingOn() {
   }
 
 
+   /**
+   * 
+   * @return terminationScheduledOn
+  **/
+  @ApiModelProperty(value = "")
+  public OffsetDateTime getTerminationScheduledOn() {
+    return terminationScheduledOn;
+  }
+
+
    /**
    * 
    * @return token
@@ -320,13 +334,14 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.terminatedBy, subscription.terminatedBy) &&
         Objects.equals(this.terminatedOn, subscription.terminatedOn) &&
         Objects.equals(this.terminatingOn, subscription.terminatingOn) &&
+        Objects.equals(this.terminationScheduledOn, subscription.terminationScheduledOn) &&
         Objects.equals(this.token, subscription.token) &&
         Objects.equals(this.version, subscription.version);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(activatedOn, affiliate, createdOn, description, id, initializedOn, language, linkedSpaceId, plannedPurgeDate, plannedTerminationDate, reference, state, subscriber, terminatedBy, terminatedOn, terminatingOn, token, version);
+    return Objects.hash(activatedOn, affiliate, createdOn, description, id, initializedOn, language, linkedSpaceId, plannedPurgeDate, plannedTerminationDate, reference, state, subscriber, terminatedBy, terminatedOn, terminatingOn, terminationScheduledOn, token, version);
   }
 
 
@@ -351,6 +366,7 @@ public String toString() {
     sb.append("    terminatedBy: ").append(toIndentedString(terminatedBy)).append("\n");
     sb.append("    terminatedOn: ").append(toIndentedString(terminatedOn)).append("\n");
     sb.append("    terminatingOn: ").append(toIndentedString(terminatingOn)).append("\n");
+    sb.append("    terminationScheduledOn: ").append(toIndentedString(terminationScheduledOn)).append("\n");
     sb.append("    token: ").append(toIndentedString(token)).append("\n");
     sb.append("    version: ").append(toIndentedString(version)).append("\n");
     sb.append("}");