Release 1.2.2.0 (#90)

Author: GreatG0ose

.github/workflows/maven.yml

@@ -11,6 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Install Chrome driver  # for integration tests with Selenium
+        uses: nanasess/setup-chromedriver@v1
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:

CHANGELOG.md

@@ -6,6 +6,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres
 to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.2.2.0][1.2.2.0]
+
+This release adds Klarna payment type to Java SDK.
+
+### Added
+
+* Added payment type `Klarna`.
+* Added `language` field to `Customer` resource.
+* Added `termsAndConditionsUrl` and `privacyPolicyUrl` fields to `AdditionalTransactionData` resource
+
+### Fixed
+
+* Fixed typo `ShippingAddress.Type:DIFFERENT_ADDRESSES` -> `ShippingAddress.Type:DIFFERENT_ADDRESS`. This typo caused errors on authorize/charge in some payment cases
+* Fixed (de-)serialization of `AbstractTransaction` cause infinite Webhook calls.
+
 ## [1.2.1.0][1.2.1.0]
 
 This release brings Unzer Paylater Invoice payment type support to Java SDK.
@@ -234,6 +249,8 @@ This release brings Unzer Paylater Invoice payment type support to Java SDK.
 *   Remove deprecated classes
     *   RestCommunication
 
+[1.2.2.0]: http://github.com/unzerdev/java-sdk/compare/1.2.1.0..1.2.2.0
+
 [1.2.1.0]: http://github.com/unzerdev/java-sdk/compare/1.2.0.0..1.2.1.0
 
 [1.2.0.0]: http://github.com/unzerdev/java-sdk/compare/1.1.2.7..1.2.0.0

README.md

@@ -14,7 +14,7 @@ Java 1.8 or later.
 <dependency>
   <groupId>com.unzer.payment</groupId>
   <artifactId>java-sdk</artifactId>
-  <version>1.2.1.0</version>
+  <version>1.2.2.0</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.unzer.payment</groupId>
     <artifactId>java-sdk</artifactId>
-    <version>1.2.1.0</version>
+    <version>1.2.2.0</version>
     <name>Unzer Java SDK</name>
     <description>Unzer Java SDK</description>
     <url>https://docs.unzer.com/</url>
@@ -135,8 +135,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.10.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -319,7 +319,7 @@
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.14.2</version>
+            <version>1.15.3</version>
             <scope>test</scope>
         </dependency>
 
@@ -330,7 +330,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- UI Test dependencies Selenium -->
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
@@ -339,16 +338,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-server</artifactId>
-            <version>3.141.59</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>htmlunit-driver</artifactId>
-            <version>2.39.0</version>
+            <groupId>io.github.bonigarcia</groupId>
+            <artifactId>webdrivermanager</artifactId>
+            <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

selenium/chrome/chromedriver

@@ -25,7 +25,6 @@
 import java.util.Date;
 
 public abstract class AbstractTransaction<T extends AbstractPayment> implements PaymentType {
-
     private String id;
     private BigDecimal amount;
     private Currency currency;
@@ -48,9 +47,9 @@ public abstract class AbstractTransaction<T extends AbstractPayment> implements
     private String type;
     private AdditionalTransactionData additionalTransactionData;
     @JsonFieldIgnore
-    private T payment;
+    private transient T payment;
     @JsonFieldIgnore
-    private Unzer unzer;
+    private transient Unzer unzer;
     @JsonFieldIgnore
     private URL resourceUrl;
 

selenium/chrome/chromedriver.exe

@@ -20,10 +20,11 @@
 import com.unzer.payment.paymenttypes.PaymentType;
 
 import java.util.Date;
+import java.util.Locale;
 
 /**
  * Business object for Customer together with billingAddress.
- * 
+ * <p>
  * firstname and lastname are mandatory to create a new Customer.
  *
  * @author Unzer E-Com GmbH
@@ -41,6 +42,15 @@ public class Customer implements PaymentType {
     private Address billingAddress;
     private ShippingAddress shippingAddress;
     private String company;
+
+    /**
+     * Customer language.
+     * <p>
+     * Mandatory depending on payment type
+     * Format: ISO 639 alpha-2 code
+     */
+    private Locale language;
+
     private CustomerCompanyData companyData;
 
     public Customer(String firstname, String lastname) {
@@ -150,14 +160,14 @@ public ShippingAddress getShippingAddress() {
     }
 
     public Customer setShippingAddress(ShippingAddress shippingAddress) {
-		this.shippingAddress = shippingAddress;
-		return this;
-	}
+        this.shippingAddress = shippingAddress;
+        return this;
+    }
 
     /**
      * @deprecated use {@link #setShippingAddress(ShippingAddress)} instead
      */
-	@Deprecated
+    @Deprecated
     public Customer setShippingAddress(Address shippingAddress) {
         this.shippingAddress = ShippingAddress.of(shippingAddress, null);
         return this;
@@ -175,8 +185,9 @@ public String getCompany() {
         return company;
     }
 
-    public void setCompany(String company) {
+    public Customer setCompany(String company) {
         this.company = company;
+        return this;
     }
 
     @Override
@@ -188,6 +199,15 @@ public void setId(String id) {
         this.id = id;
     }
 
+    public Locale getLanguage() {
+        return language;
+    }
+
+    public Customer setLanguage(Locale language) {
+        this.language = language;
+        return this;
+    }
+
     public enum Salutation {
         @SerializedName("mr")
         MR,

selenium/geckodriver/geckodriver

@@ -49,8 +49,8 @@ public static ShippingAddress of(Address address, Type shippingType) {
     public enum Type {
         @SerializedName("equals-billing")
         EQUALS_BILLING,
-        @SerializedName("different-addresses")
-        DIFFERENT_ADDRESSES,
+        @SerializedName("different-address")
+        DIFFERENT_ADDRESS,
         @SerializedName("branch-pickup")
         BRANCH_PICKUP,
         @SerializedName("post-office-pickup")

selenium/geckodriver/geckodriver.exe

@@ -37,7 +37,7 @@ public class JsonCustomer extends JsonIdObject implements JsonObject {
     private String mobile;
     private Address billingAddress;
     private ShippingAddress shippingAddress;
-
+    private String language;
     private JSonCompanyInfo companyInfo;
 
     public String getFirstname() {
@@ -136,4 +136,11 @@ public void setCompany(String company) {
         this.company = company;
     }
 
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
 }

src/main/java/com/unzer/payment/AbstractTransaction.java

@@ -20,6 +20,8 @@
 import com.unzer.payment.marketplace.MarketplaceCancel;
 import com.unzer.payment.paymenttypes.PaymentType;
 
+import java.util.Locale;
+
 public class JsonToBusinessClassMapper {
 
     public JsonObject map(AbstractTransaction<? extends AbstractPayment> abstractInitPayment) {
@@ -321,6 +323,11 @@ public JsonCustomer map(Customer customer) {
         json.setFirstname(customer.getFirstname());
         json.setLastname(customer.getLastname());
         json.setCompany(customer.getCompany());
+
+        if (customer.getLanguage() != null) {
+            json.setLanguage(customer.getLanguage().getLanguage());
+        }
+
         json.setCustomerId(customer.getCustomerId());
         json.setEmail(customer.getEmail());
         json.setMobile(customer.getMobile());
@@ -340,6 +347,11 @@ public Customer mapToBusinessObject(Customer customer, JsonCustomer json) {
         customer.setLastname(json.getLastname());
         customer.setCompany(json.getCompany());
         customer.setCustomerId(json.getCustomerId());
+
+        if(json.getLanguage() != null && !json.getLanguage().isEmpty()) {
+            customer.setLanguage(new Locale(json.getLanguage()));
+        }
+
         customer.setEmail(json.getEmail());
         customer.setMobile(json.getMobile());
         customer.setPhone(json.getPhone());

src/main/java/com/unzer/payment/Customer.java

@@ -25,6 +25,16 @@ public class AdditionalTransactionData {
     private ShippingTransactionData shipping;
     private RiskData riskData;
 
+    /**
+     * URL to the merchant's Terms and Conditions Page
+     */
+    private String termsAndConditionUrl;
+
+    /**
+     * URL to the merchant's Privacy Policy Page
+     */
+    private String privacyPolicyUrl;
+
     public CardTransactionData getCard() {
         return card;
     }
@@ -51,4 +61,34 @@ public AdditionalTransactionData setRiskData(RiskData riskData) {
         this.riskData = riskData;
         return this;
     }
+
+    /**
+     * URL to the merchant's Terms and Conditions Page
+     */
+    public String getTermsAndConditionsUrl() {
+        return termsAndConditionUrl;
+    }
+
+    /**
+     * URL to the merchant's Terms and Conditions Page
+     */
+    public AdditionalTransactionData setTermsAndConditionsUrl(String termsAndConditionsUrl) {
+        this.termsAndConditionUrl = termsAndConditionsUrl;
+        return this;
+    }
+
+    /**
+     * URL to the merchant's Privacy Policy Page
+     */
+    public String getPrivacyPolicyUrl() {
+        return privacyPolicyUrl;
+    }
+
+    /**
+     * URL to the merchant's Privacy Policy Page
+     */
+    public AdditionalTransactionData setPrivacyPolicyUrl(String privacyPolicyUrl) {
+        this.privacyPolicyUrl = privacyPolicyUrl;
+        return this;
+    }
 }

src/main/java/com/unzer/payment/ShippingAddress.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020-today Unzer E-Com GmbH
+ *
+ * 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.unzer.payment.paymenttypes;
+
+import com.unzer.payment.GeoLocation;
+import com.unzer.payment.communication.json.JsonIdObject;
+import com.unzer.payment.communication.json.JsonObject;
+
+public class Klarna extends AbstractPaymentType {
+    @Override
+    public String getTypeUrl() {
+        return "types/klarna";
+    }
+
+    @Override
+    public PaymentType map(PaymentType paymentType, JsonObject jsonObject) {
+        ((Klarna) paymentType).setId(jsonObject.getId());
+        ((Klarna) paymentType).setRecurring(((JsonIdObject) jsonObject).getRecurring());
+        GeoLocation tempGeoLocation = new GeoLocation(((JsonIdObject) jsonObject).getGeoLocation().getClientIp(), ((JsonIdObject) jsonObject).getGeoLocation().getCountryIsoA2());
+        ((Klarna) paymentType).setGeoLocation(tempGeoLocation);
+
+        return paymentType;
+    }
+}

src/main/java/com/unzer/payment/communication/json/JsonCustomer.java

@@ -44,6 +44,7 @@ public enum PaymentTypeEnum {
     PF_CARD("pfc"),
     PF_EFINANCE("pfe"),
     UNZER_PAYLATER_INVOICE("piv"),
+    KLARNA("kla"),
     UNKNOWN("unknown");
 
     private String shortName;

src/main/java/com/unzer/payment/communication/mapper/JsonToBusinessClassMapper.java

@@ -565,6 +565,7 @@ private JsonIdObject getJsonObjectFromTypeId(String typeId) {
             case PF_CARD:
             case PF_EFINANCE:
             case UNZER_PAYLATER_INVOICE:
+            case KLARNA:
                 return new JsonIdObject();
             case PAYPAL:
                 return new JsonPaypal();
@@ -644,6 +645,8 @@ private AbstractPaymentType getPaymentTypeFromTypeId(String typeId) {
                 return new PostFinanceEFinance();
             case UNZER_PAYLATER_INVOICE:
                 return new PaylaterInvoice();
+            case KLARNA:
+                return new Klarna();
             default:
                 throw new PaymentException("Type '" + typeId + "' is currently not supported by the SDK");
         }