Release 2.1.0

Author: vttn

README.md

@@ -23,7 +23,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.postfinancecheckout</groupId>
     <artifactId>postfinancecheckout-java-sdk</artifactId>
-    <version>2.0.11</version>
+    <version>2.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.postfinancecheckout:postfinancecheckout-java-sdk:2.0.11"
+compile "com.postfinancecheckout:postfinancecheckout-java-sdk:2.1.0"
 ```
 
 ### Others
@@ -46,7 +46,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/postfinancecheckout-java-sdk-2.0.11.jar`
+* `target/postfinancecheckout-java-sdk-2.1.0.jar`
 * `target/lib/*.jar`
 
 ## Usage
@@ -81,132 +81,104 @@ public class Example {
 To get started with sending transactions, please review the example below:
 
 ```java
-package com.postfinancecheckout.sdk.example;
+package com.postfinancecheckout.sdk.test;
 
 import com.postfinancecheckout.sdk.ApiClient;
-import com.postfinancecheckout.sdk.ApiException;
-import com.postfinancecheckout.sdk.ApiResponse;
-import com.postfinancecheckout.sdk.service.TransactionPaymentPageService;
-import com.postfinancecheckout.sdk.service.TransactionService;
 import com.postfinancecheckout.sdk.model.*;
+import com.postfinancecheckout.sdk.service.*;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.Arrays;
-import java.util.UUID;
 
+/**
+ * API tests for TransactionPaymentPageService
+ */
 public class TransactionPaymentPageServiceTest {
-    private TransactionService transactionService;
-    private TransactionCreate transactionCreate;
-    private Long spaceId;
-    private Long applicationUserId;
-    private String authenticationKey;
+
+    // Credentials
+    private Long spaceId = (long) 405;
+    private Long applicationUserId = (long) 512;
+    private String authenticationKey = "FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ=";
+
+    // Services
     private ApiClient apiClient;
-    private ApiResponse<Transaction> transaction;
+    private TransactionPaymentPageService transactionPaymentPageService;
+    private TransactionService transactionService;
+
+    // Models
+    private TransactionCreate transactionPayload;
 
     @Before
     public void setup() {
-        this.applicationUserId = (long) 512;
-        this.spaceId = (long) 405;
-        this.authenticationKey = "FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ=";
-        this.apiClient = new ApiClient(applicationUserId, authenticationKey);
-        this.transactionService = new TransactionService(this.apiClient);
-        this.createTransaction();
+        if (this.apiClient == null) {
+            this.apiClient = new ApiClient(applicationUserId, authenticationKey);
+        }
+        if (this.transactionPaymentPageService == null) {
+            this.transactionPaymentPageService = new TransactionPaymentPageService(this.apiClient);
+        }
+        if (this.transactionService == null) {
+            this.transactionService = new TransactionService(this.apiClient);
+        }
     }
 
-    private void createTransaction() {
-
-        AddressCreate billingAddress = new AddressCreate()
-        .salutation("Ms")
-        .givenName("Good")
-        .familyName("Customer")
-        .gender(Gender.FEMALE)
-        .country("CH")
-        .city("Winterthur")
-        .postcode("8400")
-        .dateOfBirth(LocalDate.of(1991, 1, 11))
-        .organizationName("Test GmbH")
-        .mobilePhoneNumber("+41791234567")
-        .emailAddress("[email protected]");
-
-        AddressCreate shippingAddress = new AddressCreate()
-        .salutation("Ms")
-        .givenName("Good")
-        .familyName("Customer")
-        .gender(Gender.FEMALE)
-        .country("CH")
-        .city("Winterthur")
-        .postcode("8400")
-        .dateOfBirth(LocalDate.of(1991, 1, 11))
-        .organizationName("Test GmbH")
-        .mobilePhoneNumber("+41791234567")
-        .emailAddress("[email protected]");
-
-        LineItemCreate lineItem1 = new LineItemCreate()
-        .sku("item-1")
-        .name("Item 1")
-        .uniqueId("unique-id-item-1")
-        .type(LineItemType.PRODUCT)
-        .quantity(BigDecimal.ONE)
-        .shippingRequired(true)
-        .amountIncludingTax(new BigDecimal("67.47"))
-        .addTaxesItem(
-            new TaxCreate().title("VAT").rate(new BigDecimal(8))
-        );
-
-        LineItemCreate lineItem2 = new LineItemCreate()
-        .sku("test-shipping")
-        .name("Shipping")
-        .uniqueId("unique-id-test-shipping")
-        .type(LineItemType.SHIPPING)
-        .quantity(BigDecimal.ONE)
-        .amountIncludingTax(new BigDecimal("3.12"))
-        .addTaxesItem(
-            new TaxCreate().title("VAT").rate(new BigDecimal(8))
-        );
-
-        this.transactionCreate = new TransactionCreate();
-        this.transactionCreate.customerEmailAddress("[email protected]");
-        this.transactionCreate.customerId("cutomer-x");
-        this.transactionCreate.merchantReference(UUID.randomUUID().toString());
-        this.transactionCreate.invoiceMerchantReference("order-1");
-        this.transactionCreate.successUrl("http://localhost/success?orderId=1");
-        this.transactionCreate.failedUrl("http://localhost/failed?orderId=1");
-        this.transactionCreate.shippingMethod("Test Shipping");
-        this.transactionCreate.chargeRetryEnabled(false);
-        this.transactionCreate.allowedPaymentMethodConfigurations(Arrays.asList(8656l));
-        this.transactionCreate.language("en-US");
-        this.transactionCreate.currency("CHF");
-        this.transactionCreate.billingAddress(billingAddress);
-        this.transactionCreate.shippingAddress(shippingAddress);
-        this.transactionCreate.addLineItemsItem(lineItem1);
-        this.transactionCreate.addLineItemsItem(lineItem2);
-        try {
-            this.transaction = this.transactionService.createWithHttpInfo(
-                this.spaceId,
-                this.transactionCreate
-            );
-        } catch (ApiException e) {
-            Assert.fail("Failed to create transaction. Reason: " + e.getMessage() + " Details: " + e.getResponseBody());
+    /**
+     * Get transaction payload
+     *
+     * @return TransactionCreate
+     */
+    private TransactionCreate getTransactionPayload() {
+        if (this.transactionPayload == null) {
+            // Line item
+            LineItemCreate lineItem = new LineItemCreate();
+            lineItem.name("Red T-Shirt")
+                    .uniqueId("5412")
+                    .type(LineItemType.PRODUCT)
+                    .quantity(BigDecimal.valueOf(1))
+                    .amountIncludingTax(BigDecimal.valueOf(29.95))
+                    .sku("red-t-shirt-123");
+
+            // Customer Billind Address
+            AddressCreate billingAddress = new AddressCreate();
+            billingAddress.city("Winterthur")
+                    .country("CH")
+                    .emailAddress("[email protected]")
+                    .familyName("Customer")
+                    .givenName("Good")
+                    .postcode("8400")
+                    .postalState("ZH")
+                    .organizationName("Test GmbH")
+                    .mobilePhoneNumber("+41791234567")
+                    .salutation("Ms");
+
+            this.transactionPayload = new TransactionCreate();
+            this.transactionPayload.autoConfirmationEnabled(true).currency("CHF").language("en-US");
+            this.transactionPayload.setBillingAddress(billingAddress);
+            this.transactionPayload.setShippingAddress(billingAddress);
+            this.transactionPayload.addLineItemsItem(lineItem);
         }
+        return this.transactionPayload;
     }
 
+    /**
+     * Build Payment Page URL
+     *
+     * This operation creates the URL to which the user should be redirected to when the payment page should be used.
+     *
+     */
     @Test
-    public void testPaymentPageUrl() {
-
-        TransactionPaymentPageService transactionPaymentPageService = new TransactionPaymentPageService(this.apiClient);
-        String paymentPageUrl     = null;
+    public void paymentPageUrlTest() {
         try {
-            paymentPageUrl = transactionPaymentPageService.paymentPageUrl(this.spaceId, this.transaction.getData().getId());
-        } catch (ApiException e) {
+            Transaction transaction = this.transactionService.create(this.spaceId, this.getTransactionPayload());
+            String paymentPageUrl = this.transactionPaymentPageService.paymentPageUrl(spaceId, transaction.getId());
+            Assert.assertTrue(paymentPageUrl.contains("https://"));
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        System.out.println(paymentPageUrl);
-        Assert.assertTrue(paymentPageUrl.contains("http"));
     }
+
 }
 
 ```

build.gradle

@@ -1,17 +1,16 @@
-apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.postfinancecheckout'
-version = '2.0.11'
+version = '2.1.0'
 
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.+'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.android.tools.build:gradle:1.5.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
@@ -24,19 +23,19 @@ if(hasProperty('target') && target == 'android') {
 
     apply plugin: 'com.android.library'
     apply plugin: 'com.github.dcendents.android-maven'
-
+    
     android {
-        compileSdkVersion 25
-        buildToolsVersion '25.0.2'
+        compileSdkVersion 23
+        buildToolsVersion '23.0.2'
         defaultConfig {
             minSdkVersion 14
-            targetSdkVersion 25
+            targetSdkVersion 22
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
         }
-
+    
         // Rename the aar correctly
         libraryVariants.all { variant ->
             variant.outputs.each { output ->
@@ -52,7 +51,7 @@ if(hasProperty('target') && target == 'android') {
             provided 'javax.annotation:jsr250-api:1.0'
         }
     }
-
+    
     afterEvaluate {
         android.libraryVariants.all { variant ->
             def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
@@ -64,12 +63,12 @@ if(hasProperty('target') && target == 'android') {
             artifacts.add('archives', task);
         }
     }
-
+    
     task sourcesJar(type: Jar) {
         from android.sourceSets.main.java.srcDirs
         classifier = 'sources'
     }
-
+    
     artifacts {
         archives sourcesJar
     }
@@ -87,19 +86,30 @@ if(hasProperty('target') && target == 'android') {
             pom.artifactId = 'postfinancecheckout-java-sdk'
         }
     }
-
+    
     task execute(type:JavaExec) {
        main = System.getProperty('mainClass')
        classpath = sourceSets.main.runtimeClasspath
     }
 }
 
+ext {
+    swagger_annotations_version = "1.5.17"
+    jackson_version = "2.10.1"
+    google_api_client_version = "1.23.0"
+    jersey_common_version = "2.29.1"
+    jodatime_version = "2.9.9"
+    junit_version = "4.12"
+}
+
 dependencies {
-    compile 'io.swagger:swagger-annotations:1.5.17'
-    compile 'com.squareup.okhttp:okhttp:2.7.5'
-    compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
-    compile 'com.google.code.gson:gson:2.8.1'
-    compile 'io.gsonfire:gson-fire:1.8.0'
-    compile 'junit:junit:4.12'
-    testCompile 'junit:junit:4.12'
+    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.api-client:google-api-client:${google_api_client_version}"
+    compile "org.glassfish.jersey.core:jersey-common:${jersey_common_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 "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
+    testCompile "junit:junit:$junit_version"
 }

build.sbt

@@ -2,18 +2,20 @@ lazy val root = (project in file(".")).
   settings(
     organization := "com.postfinancecheckout",
     name := "postfinancecheckout-java-sdk",
-    version := "2.0.11",
+    version := "2.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.squareup.okhttp" % "okhttp" % "2.7.5",
-      "com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
-      "com.google.code.gson" % "gson" % "2.8.1",
-      "io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
+      "com.google.api-client" % "google-api-client" % "1.23.0",
+      "org.glassfish.jersey.core" % "jersey-common" % "2.29.1",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.10.1" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )