fix: set request headers (#20)

Author: spkjp

CHANGELOG.md

@@ -7,10 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
-## 0.1.1 - 2018-11-23
+## 0.1.1 - 2018-12-10
 
-### Changed:
-- Always send the `Content-Type` header
+### Fixed:
+- Set `API-Version` instead of `version` on client
+- Correctly set request headers
 
 ## 0.1.0 - 2018-10-08
 - Initial Release

src/main/java/org/arkecosystem/client/Connection.java

@@ -15,8 +15,8 @@ public class Connection<T extends AbstractAPI> {
     private T api;
 
     public Connection(Map<String, Object> config) {
-        this.version = ((int) (config.get("version")));
-        this.client = new Client(config.get("host").toString(), (int) config.get("version"));
+        this.version = ((int) (config.get("API-Version")));
+        this.client = new Client(config.get("host").toString(), Integer.toString(this.version));
 
         this.api = (T) ((this.version == 1) ? new One(this.client) : new Two(this.client));
     }

src/main/java/org/arkecosystem/client/http/Client.java

@@ -10,26 +10,34 @@
 
 public class Client {
     private String host;
-    private int version;
+    private String version;
     private OkHttpClient client;
+    private Headers headers;
     private MediaType JSON = MediaType.parse("application/json");
 
-    public Client(String host, int version) {
+    public Client(String host, String version) {
         this.host = host;
         this.version = version;
         this.client = new OkHttpClient();
+
+        HashMap<String, String> headers = new HashMap<>();
+        headers.put("API-Version", this.version);
+        headers.put("content-type", this.JSON.toString());
+
+        this.headers = Headers.of(headers);
     }
 
     public LinkedTreeMap<String, Object> get(String url, Map<String, Object> params) throws IOException {
-        HttpUrl.Builder httpBuider = HttpUrl.parse(this.host + url).newBuilder();
+        HttpUrl.Builder httpBuilder = HttpUrl.parse(this.host + url).newBuilder();
 
         if (params != null) {
             for (Map.Entry<String, Object> entry : params.entrySet()) {
-                httpBuider.addQueryParameter(entry.getKey(), entry.getValue().toString());
+                httpBuilder.addQueryParameter(entry.getKey(), entry.getValue().toString());
             }
         }
 
-        Request request = new Request.Builder().url(httpBuider.build()).build();
+        Request request = new Request.Builder().headers(this.headers).url(httpBuilder.build()).build();
+
         Response response = client.newCall(request).execute();
         return new Gson().fromJson(response.body().string(), new LinkedTreeMap<String, Object>().getClass());
     }
@@ -40,7 +48,7 @@ public LinkedTreeMap<String, Object> get(String url) throws IOException {
 
     public LinkedTreeMap<String, Object> post(String url, Map payload) throws IOException {
         RequestBody body = RequestBody.create(JSON, new Gson().toJson(payload));
-        Request request = new Request.Builder().url(this.host + url).post(body).build();
+        Request request = new Request.Builder().headers(this.headers).url(this.host + url).post(body).build();
         Response response = client.newCall(request).execute();
         return new Gson().fromJson(response.body().string(), new LinkedTreeMap<String, Object>().getClass());
     }

src/test/java/org/arkecosystem/client/ConnectionManagerTest.java

@@ -10,12 +10,11 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ConnectionManagerTest {
-
     @Test
     public void connect() {
         HashMap<String, Object> map = new HashMap<>();
         map.put("host", "dummy");
-        map.put("version", 1);
+        map.put("API-Version", 1);
 
         ConnectionManager manager = new ConnectionManager();
         manager.connect(map);
@@ -26,7 +25,7 @@ public void connect() {
     public void disconnect() {
         HashMap<String, Object> map = new HashMap<>();
         map.put("host", "dummy");
-        map.put("version", 1);
+        map.put("API-Version", 1);
 
         ConnectionManager manager = new ConnectionManager();
         manager.connect(map);
@@ -35,10 +34,11 @@ public void disconnect() {
         assertEquals(0, manager.getConnections().size());
     }
 
+    @Test
     public void connection() {
         HashMap<String, Object> map = new HashMap<>();
         map.put("host", "dummy");
-        map.put("version", 1);
+        map.put("API-Version", 1);
 
         ConnectionManager manager = new ConnectionManager();
         manager.connect(map);
@@ -68,14 +68,14 @@ public void getConnections() {
 
         HashMap<String, Object> map = new HashMap<>();
         map.put("host", "dummy");
-        map.put("version", 1);
+        map.put("API-Version", 1);
 
         Connection<One> connection1 = manager.connect(map);
         assertNotNull(connection1);
 
         map = new HashMap<>();
         map.put("host", "dummy");
-        map.put("version", 2);
+        map.put("API-Version", 2);
 
         Connection<Two> connection2 = manager.connect(map, "backup");
         assertNotNull(connection2);

src/test/java/org/arkecosystem/client/MockHelper.java

@@ -12,7 +12,7 @@ public static Connection connection(int version) {
 
         HashMap<String, Object> map = new HashMap<>();
         map.put("host", mockServer.url("/").toString());
-        map.put("version", version);
+        map.put("API-Version", version);
         Connection connection = new Connection(map);
 
         MockResponse mockedResponse = new MockResponse();