Remade some of the mapping functions

Author: JanHolger

pom.xml

@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>org.javawebstack</groupId>
-            <artifactId>QueryString</artifactId>
+            <artifactId>Graph</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>

src/main/java/org/javawebstack/httpclient/HTTPClient.java

@@ -1,8 +1,8 @@
 package org.javawebstack.httpclient;
 
-import com.google.gson.FieldNamingPolicy;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import org.javawebstack.graph.GraphElement;
+import org.javawebstack.graph.GraphMapper;
+import org.javawebstack.graph.NamingPolicy;
 import org.javawebstack.httpclient.interceptor.BeforeRequestInterceptor;
 import org.javawebstack.httpclient.interceptor.ResponseTransformer;
 
@@ -11,11 +11,8 @@
 
 public class HTTPClient {
 
-    private Gson gson = new GsonBuilder()
-            .setDateFormat("yyyy-MM-dd HH:mm:ss")
-            .disableHtmlEscaping()
-            .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
-            .create();
+    private GraphMapper graphMapper = new GraphMapper()
+            .setNamingPolicy(NamingPolicy.SNAKE_CASE);
     private int timeout = 5000;
     private String baseUrl = "";
     private Map<String, String> defaultHeaders = new HashMap<>();
@@ -30,13 +27,13 @@ public HTTPClient(String baseUrl) {
 
     public HTTPClient() { }
 
-    public HTTPClient gson(Gson gson){
-        this.gson = gson;
+    public HTTPClient graphMapper(GraphMapper mapper){
+        this.graphMapper = mapper;
         return this;
     }
 
-    public Gson getGson() {
-        return gson;
+    public GraphMapper getGraphMapper(){
+        return graphMapper;
     }
 
     public HTTPClient timeout(int timeout){
@@ -122,7 +119,7 @@ public HTTPRequest post(String path){
     }
 
     public HTTPRequest post(String path, Object body){
-        return post(path).jsonBody(body);
+        return post(path).jsonBody((GraphElement) body);
     }
 
     public HTTPRequest put(String path){

src/main/java/org/javawebstack/httpclient/HTTPRequest.java

@@ -1,5 +1,6 @@
 package org.javawebstack.httpclient;
 
+import org.javawebstack.graph.GraphElement;
 import org.javawebstack.httpclient.interceptor.ResponseTransformer;
 import org.javawebstack.querystring.QueryString;
 
@@ -75,20 +76,34 @@ public HTTPRequest basicAuthorization(String username, String password){
         return authorization("Basic", Base64.getEncoder().encodeToString((username+":"+password).getBytes()));
     }
 
-    public HTTPRequest formBody(Map<String, String> data){
-        return body(new QueryString(data).toString());
+    public HTTPRequest formBodyString(QueryString query) {
+        return body(query.toString()).contentType("application/x-www-form-urlencoded");
     }
 
-    public HTTPRequest formBody(QueryString query) {
-        return body(query.toString());
+    public HTTPRequest formBody(Object object){
+        if(object instanceof QueryString)
+            return formBodyString((QueryString) object);
+        if(object instanceof GraphElement)
+            return formBodyElement((GraphElement) object);
+        return formBodyElement(client.getGraphMapper().toGraph(object));
+    }
+
+    public HTTPRequest formBodyElement(GraphElement element){
+        return body(element.toJsonString()).contentType("application/x-www-form-urlencoded");
     }
 
     public HTTPRequest bearer(String token){
         return authorization("Bearer", token);
     }
 
     public HTTPRequest jsonBody(Object object){
-        return body(client.getGson().toJson(object)).contentType("application/json");
+        if(object instanceof GraphElement)
+            return jsonBodyElement((GraphElement) object);
+        return jsonBodyElement(client.getGraphMapper().toGraph(object));
+    }
+
+    public HTTPRequest jsonBodyElement(GraphElement element){
+        return body(element.toJsonString()).contentType("application/json");
     }
 
     public int status(){
@@ -106,14 +121,23 @@ public String string(){
         return new String(bytes(), StandardCharsets.UTF_8);
     }
 
-    public <T> T json(Class<T> type){
+    public <T> T object(Class<T> type){
         if(type == null)
             return null;
         if(type.equals(byte[].class))
             return (T) responseBody;
         if(type.equals(String.class))
             return (T) string();
-        return client.getGson().fromJson(string(), type);
+        return client.getGraphMapper().fromGraph(graph(), type);
+    }
+
+    public GraphElement graph(){
+        String contentType = header("Content-Type");
+        switch (contentType){
+            case "application/x-www-form-urlencoded":
+                GraphElement.fromFormData(string());
+        }
+        return GraphElement.fromJson(string());
     }
 
     public String header(String key){