Release 4.0.8

Author: sauliususoniswallee

README.md

@@ -23,7 +23,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>ch.postfinance</groupId>
     <artifactId>postfinancecheckout-java-sdk</artifactId>
-    <version>4.0.7</version>
+    <version>4.0.8</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 "ch.postfinance:postfinancecheckout-java-sdk:4.0.7"
+compile "ch.postfinance:postfinancecheckout-java-sdk:4.0.8"
 ```
 
 ### Others
@@ -46,7 +46,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/postfinancecheckout-java-sdk-4.0.7.jar`
+* `target/postfinancecheckout-java-sdk-4.0.8.jar`
 * `target/lib/*.jar`
 
 ## Usage

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'ch.postfinance'
-version = '4.0.7'
+version = '4.0.8'
 
 buildscript {
     repositories {

build.sbt

@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
   settings(
     organization := "ch.postfinance",
     name := "postfinancecheckout-java-sdk",
-    version := "4.0.7",
+    version := "4.0.8",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>postfinancecheckout-java-sdk</artifactId>
     <packaging>jar</packaging>
     <name>postfinancecheckout-java-sdk</name>
-    <version>4.0.7</version>
+    <version>4.0.8</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>

src/main/java/ch/postfinance/sdk/ApiClient.java

@@ -1,6 +1,8 @@
 package ch.postfinance.sdk;
 
 import ch.postfinance.sdk.service.*;
+import java.util.HashMap;
+import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -12,6 +14,7 @@
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.Json;
+import com.google.api.client.http.HttpHeaders;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -23,6 +26,7 @@ public class ApiClient {
     private final ObjectMapper objectMapper;
     private final long userId;
     private final String applicationKey;
+    private final Map<String, String> defaultHeaders;
     public final static int READ_TIMEOUT = 20 * 1000;
 
     // A reasonable default object mapper. Client can pass in a chosen ObjectMapper anyway, this is just for reasonable defaults.
@@ -36,6 +40,7 @@ private static ObjectMapper createDefaultObjectMapper() {
         return objectMapper;
     }
 
+
     /**
      * Constructor for ApiClient
      *
@@ -45,7 +50,7 @@ private static ObjectMapper createDefaultObjectMapper() {
     public ApiClient(long userId, String applicationKey) {
 		this(userId, applicationKey, "https://checkout.postfinance.ch:443/api");
 	}
-	
+
     /**
      * Constructor for ApiClient
      *
@@ -66,6 +71,7 @@ public ApiClient(long userId, String applicationKey, String basePath) {
 		this.basePath = basePath;
         this.userId = userId;
         this.applicationKey = applicationKey;
+        this.defaultHeaders = new HashMap<>();
         this.httpRequestFactory = this.createRequestFactory();
         this.objectMapper = createDefaultObjectMapper();
     }
@@ -75,15 +81,19 @@ public HttpRequestFactory getHttpRequestFactory() {
     }
 
     public HttpRequestFactory createRequestFactory() {
-        final Auth signer = new Auth(this.userId, this.applicationKey);
+        final RequestInterceptor interceptor = new RequestInterceptor(this.userId, this.applicationKey, this.defaultHeaders);
         NetHttpTransport transport = new NetHttpTransport();
         return transport.createRequestFactory(new HttpRequestInitializer() {
             public void initialize(HttpRequest request) {
-                request.setInterceptor(signer);
+                request.setInterceptor(interceptor);
             }
         });
     }
 
+    public void addDefaultHeader (String key, String value) {
+        this.defaultHeaders.put(key, value);
+    }
+
     public String getBasePath() {
         return basePath;
     }

src/main/java/ch/postfinance/sdk/Auth.java

@@ -19,7 +19,7 @@
 /**
  * Auth
  */
-public class Auth implements HttpExecuteInterceptor {
+public class Auth {
 
     private long userId;
     private String applicationKey;

src/main/java/ch/postfinance/sdk/DefaultHeaders.java

@@ -0,0 +1,43 @@
+package ch.postfinance.sdk;
+
+import com.google.api.client.http.HttpExecuteInterceptor;
+import com.google.api.client.http.HttpHeaders;
+import com.google.api.client.http.HttpRequest;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+* Default headers interceptor
+*/
+public class DefaultHeaders {
+
+    private final Map<String, String> defaultHeaders;
+
+    /**
+    *
+    * @param defaultHeaders default headers
+    */
+    public DefaultHeaders(Map<String, String> defaultHeaders) {
+        this.defaultHeaders = defaultHeaders;
+    }
+
+    /**
+    * Intercept given http request
+    * @param request
+    * @throws IOException
+    */
+    public void intercept(HttpRequest request) throws IOException {
+        request.getHeaders().putAll(getDefaultHeaders());
+        defaultHeaders.forEach((key, value) -> request.getHeaders().putIfAbsent(key, value));
+    }
+
+    private HttpHeaders getDefaultHeaders() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.put("x-meta-sdk-version", "4.0.8");
+        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"));
+        return headers;
+    }
+}

src/main/java/ch/postfinance/sdk/RequestInterceptor.java

@@ -0,0 +1,37 @@
+package ch.postfinance.sdk;
+
+import com.google.api.client.http.HttpExecuteInterceptor;
+import com.google.api.client.http.HttpRequest;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+* Common http request interceptor
+*/
+public class RequestInterceptor implements HttpExecuteInterceptor {
+    private final DefaultHeaders headerModifier;
+    private final Auth signer;
+
+    /**
+    *
+    * @param userId user id
+    * @param applicationKey application key
+    * @param defaultHeaders default headers
+    */
+    public RequestInterceptor(long userId, String applicationKey, Map<String, String> defaultHeaders) {
+        this.signer = new Auth(userId, applicationKey);
+        this.headerModifier = new DefaultHeaders(defaultHeaders);
+    }
+
+    /**
+    * Intercept given http request
+    * @param request request
+    * @throws IOException IOException
+    */
+    @Override
+    public void intercept(HttpRequest request) throws IOException {
+        headerModifier.intercept(request);
+        signer.intercept(request);
+    }
+}