Replaced httpclient with Okhttp. (bunq/sdk_java#25)

build.gradle

@@ -14,12 +14,11 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     // https://mvnrepository.com/artifact/com.google.code.gson/gson
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.1'
-    // https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient
-    compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'
+    compile 'com.squareup.okhttp3:okhttp:3.9.1'
     // https://mvnrepository.com/artifact/org.apache.commons/commons-io
     compile group: 'org.apache.commons', name: 'commons-io', version: '1.3.2'
     // https://mvnrepository.com/artifact/com.squareup.okio/okio
     compile group: 'com.squareup.okio', name: 'okio', version: '1.13.0'
 }
 
-apply plugin: 'idea'
+apply plugin: 'idea'

src/main/java/com/bunq/sdk/context/ApiContext.java

@@ -12,7 +12,6 @@
 import com.google.gson.annotations.SerializedName;
 import java.io.File;
 import java.io.IOException;
-import java.net.URI;
 import java.security.KeyPair;
 import java.util.ArrayList;
 import java.util.Date;
@@ -275,10 +274,14 @@ public String toJson() {
   /**
    * @return The base URI of the current environment.
    */
-  public URI getBaseUri() {
+  public String getBaseUri() {
     return environmentType.getBaseUri();
   }
 
+  public String getApiVersoin() {
+    return environmentType.getApiVersion();
+  }
+
   /**
    * @return The session token, installation token if the session isn't created yet, or null if no
    * installation is created either.

src/main/java/com/bunq/sdk/context/ApiEnvironmentType.java

@@ -1,35 +1,33 @@
 package com.bunq.sdk.context;
 
-import com.bunq.sdk.exception.UncaughtExceptionError;
-import java.net.URI;
-import java.net.URISyntaxException;
-
 /**
  * Enum for the API environment types and their URIs.
  */
 public enum ApiEnvironmentType {
 
-  PRODUCTION("https://api.bunq.com/v1/"),
-  SANDBOX("https://sandbox.public.api.bunq.com/v1/");
+  PRODUCTION("api.bunq.com", "v1"),
+  SANDBOX("sandbox.public.api.bunq.com", "v1");
 
   /**
    * Base URI of each given environment.
    */
   private String baseUri;
+  private String apiVersion;
 
-  ApiEnvironmentType(String baseUri) {
+  ApiEnvironmentType(String baseUri, String apiVersion) {
     this.baseUri = baseUri;
+    this.apiVersion = apiVersion;
   }
 
   /**
    * @return Base URI of the environment.
    */
-  URI getBaseUri() {
-    try {
-      return new URI(this.baseUri);
-    } catch (URISyntaxException exception) {
-      throw new UncaughtExceptionError(exception);
-    }
+  String getBaseUri() {
+    return this.baseUri;
+  }
+
+  String getApiVersion() {
+    return this.apiVersion;
   }
 
 }