Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/org/javawebstack/httpclient/HTTPClient.java

Author: JanHolger

README.md

@@ -0,0 +1,26 @@
+<p align="center"><img src="https://raw.githubusercontent.com/JavaWebStack/docs/master/src/assets/img/icon.svg" width="100">
+<br><br>
+JavaWebStack HTTP-Client
+</p>
+
+
+
+## A little tour
+Full documentations: [HTTP-Client JWS-Docs](https://javawebstack.org/docs/http-client)
+
+```java
+HTTPClient client = new HTTPClient();
+
+// Sending a simple GET-Request and printing the response-text
+System.out.println(client.get("https://example.javawebstack.org/api/test").string());
+
+// Setting a base-url
+client.setBaseUrl("https://example.javawebstack.org"); // or new HTTPClient(baseUrl)
+
+// Sending a POST-Request with a JSON-Body
+Map<String, Object> data = new HashMap<>();
+data.put("username", "password");
+
+HTTPResponse res = client.post("/api/post")
+                        .jsonBody(data).json(User.class);
+```

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

@@ -3,6 +3,8 @@
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import org.javawebstack.httpclient.interfaces.BeforeRequest;
+import org.javawebstack.httpclient.interfaces.ResponseTransformer;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -17,6 +19,15 @@ public class HTTPClient {
     private int timeout = 5000;
     private String baseUrl = "";
     private Map<String, String> defaultHeaders = new HashMap<>();
+    private ResponseTransformer transformer;
+
+    private BeforeRequest beforeInterceptor;
+
+    public HTTPClient(String baseUrl) {
+        this.baseUrl = baseUrl;
+    }
+
+    public HTTPClient() { }
     private Map<String, String> defaultQuery = new HashMap<>();
 
     public HTTPClient gson(Gson gson){
@@ -80,6 +91,11 @@ public HTTPClient setBaseUrl(String baseUrl) {
         return this;
     }
 
+    public HTTPClient transformer(ResponseTransformer responseTransformer){
+        transformer = responseTransformer;
+        return this;
+    }
+
     public String getBaseUrl() {
         return baseUrl;
     }
@@ -92,6 +108,15 @@ public HTTPRequest get(String path){
         return request("GET", path);
     }
 
+    public HTTPClient before(BeforeRequest requestInterceptor){
+        beforeInterceptor = requestInterceptor;
+        return this;
+    }
+
+    public BeforeRequest getBeforeInterceptor() {
+        return beforeInterceptor;
+    }
+
     public HTTPRequest post(String path){
         return request("POST", path);
     }
@@ -112,4 +137,7 @@ public HTTPRequest delete(String path){
         return request("DELETE", path);
     }
 
+    public ResponseTransformer getTransformer() {
+        return transformer;
+    }
 }

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

@@ -1,5 +1,6 @@
 package org.javawebstack.httpclient;
 
+import org.javawebstack.httpclient.interfaces.ResponseTransformer;
 import org.javawebstack.querystring.QueryString;
 
 import java.io.ByteArrayOutputStream;
@@ -95,7 +96,7 @@ public int status(){
     }
 
     public byte[] bytes(){
-        if (requestBody == null)
+        if (responseBody == null)
             execute();
 
         return responseBody;
@@ -119,6 +120,17 @@ public String header(String key){
         return responseHeaders.get(key);
     }
 
+    public <T> T transform(ResponseTransformer responseTransformer, Class<T> type){
+        return (T) responseTransformer.transform(this);
+    }
+
+    /*
+    * Requires a transformer in the HttpClient
+    * */
+    public <T> T transform(Class<T> type){
+        return (T) client.getTransformer().transform(this);
+    }
+
     public HTTPRequest execute(){
         HttpURLConnection conn = null;
         try{
@@ -131,6 +143,11 @@ public HTTPRequest execute(){
             for(String k : requestHeaders.keySet()){
                 conn.setRequestProperty(k, requestHeaders.get(k));
             }
+
+            if (client.getBeforeInterceptor() != null)
+                client.getBeforeInterceptor().doBefore(this);
+
+
             if(requestBody!=null){
                 conn.setDoOutput(true);
                 OutputStream os = conn.getOutputStream();
@@ -172,4 +189,7 @@ private static byte[] readAll(InputStream is) throws IOException {
         return baos.toByteArray();
     }
 
+    public String toString(){
+        return string();
+    }
 }

src/main/java/org/javawebstack/httpclient/interfaces/BeforeRequest.java

@@ -0,0 +1,7 @@
+package org.javawebstack.httpclient.interfaces;
+
+import org.javawebstack.httpclient.HTTPRequest;
+
+public interface BeforeRequest {
+    void doBefore(HTTPRequest request);
+}

src/main/java/org/javawebstack/httpclient/interfaces/ResponseTransformer.java

@@ -0,0 +1,7 @@
+package org.javawebstack.httpclient.interfaces;
+
+import org.javawebstack.httpclient.HTTPRequest;
+
+public interface ResponseTransformer {
+    Object transform(HTTPRequest request);
+}