Merge remote-tracking branch 'origin/master'

Author: JanHolger

.github/workflows/maven-deploy-release.yml

@@ -0,0 +1,20 @@
+name: Maven Release Deploy
+on:
+  release:
+    types: [published]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build
+        run: mvn -B -DnewVersion=${{ github.event.release.tag_name }} package --file pom.xml
+      - name: Deploy to JavaWebStack Repository
+        run: mvn deploy -DnewVersion=${{ github.event.release.tag_name }} -s build/settings.xml
+        env:
+          DEPLOYMENT_USERNAME: ${{ secrets.DEPLOYMENT_USERNAME }}
+          DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }}

.github/workflows/maven-deploy.yml

@@ -10,9 +10,9 @@ jobs:
         with:
           java-version: 1.8
       - name: Build
-        run: mvn -B package --file pom.xml
+        run: mvn -DnewVersion=1.0-SNAPSHOT -B package --file pom.xml
       - name: Deploy to JavaWebStack Repository
-        run: mvn deploy -s build/settings.xml
+        run: mvn deploy -DnewVersion=1.0-SNAPSHOT -s build/settings.xml
         env:
           DEPLOYMENT_USERNAME: ${{ secrets.DEPLOYMENT_USERNAME }}
-          DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }}
+          DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }}

README.md

@@ -1,26 +1,18 @@
-<p align="center"><img src="https://raw.githubusercontent.com/JavaWebStack/docs/master/src/assets/img/icon.svg" width="100">
+<p align="center"><img src="https://raw.githubusercontent.com/JavaWebStack/docs/master/docs/assets/img/icon.svg" width="100">
 <br><br>
-JavaWebStack HTTP-Client
+JWS HTTP Client
 </p>
 
+![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/JavaWebStack/HTTP-Client/Maven%20Deploy/master)
+![GitHub](https://img.shields.io/github/license/JavaWebStack/HTTP-Client)
+![Maven metadata URL](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Frepo.javawebstack.org%2Forg%2Fjavawebstack%2FHTTP-Client%2Fmaven-metadata.xml)
+![GitHub contributors](https://img.shields.io/github/contributors/JavaWebStack/HTTP-Client)
+![Lines of code](https://img.shields.io/tokei/lines/github/JavaWebStack/HTTP-Client)
+![Discord](https://img.shields.io/discord/815612319378833408?color=%237289DA&label=discord)
+![Twitter Follow](https://img.shields.io/twitter/follow/JavaWebStack?style=social)
 
+## Introduction
+A simple to use and extendable http client wrapper around java's built in HttpURLConnection.
 
-## 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);
-```
+## Documentation
+You can find the current docs on our [website](https://docs.javawebstack.org/framework/http-client). This is a work-in-progress project though so it's not yet complete.

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.javawebstack</groupId>
     <artifactId>HTTP-Client</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>${newVersion}</version>
 
     <repositories>
         <repository>
@@ -76,4 +76,4 @@
         </repository>
     </distributionManagement>
 
-</project>
+</project>

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

@@ -2,7 +2,7 @@
 
 import org.javawebstack.abstractdata.AbstractMapper;
 import org.javawebstack.abstractdata.NamingPolicy;
-import org.javawebstack.httpclient.interceptor.BeforeRequestInterceptor;
+import org.javawebstack.httpclient.interceptor.RequestInterceptor;
 
 import java.net.HttpCookie;
 import java.nio.charset.StandardCharsets;
@@ -18,12 +18,15 @@ public class HTTPClient {
     private Map<String, String> defaultQuery = new HashMap<>();
     private List<HttpCookie> defaultCookies = new ArrayList<>();
 
-    private BeforeRequestInterceptor beforeInterceptor;
+    private RequestInterceptor beforeInterceptor;
+    private RequestInterceptor afterInterceptor;
 
     private boolean debug = false;
     private boolean sslVerification = true;
     private boolean autoCookies = false;
 
+    private boolean followRedirects = false;
+
     public HTTPClient(String baseUrl) {
         this.baseUrl = baseUrl;
     }
@@ -153,15 +156,23 @@ public HTTPRequest get(String path){
         return request("GET", path);
     }
 
-    public HTTPClient before(BeforeRequestInterceptor requestInterceptor){
+    public HTTPClient before(RequestInterceptor requestInterceptor){
         beforeInterceptor = requestInterceptor;
         return this;
     }
+    public HTTPClient after(RequestInterceptor requestInterceptor) {
+        afterInterceptor = requestInterceptor;
+        return this;
+    }
 
-    public BeforeRequestInterceptor getBeforeInterceptor() {
+    public RequestInterceptor getBeforeInterceptor() {
         return beforeInterceptor;
     }
 
+    public RequestInterceptor getAfterInterceptor() {
+        return afterInterceptor;
+    }
+
     public HTTPRequest post(String path){
         return request("POST", path);
     }
@@ -182,4 +193,11 @@ public HTTPRequest delete(String path){
         return request("DELETE", path);
     }
 
+    public boolean isFollowingRedirects() {
+        return followRedirects;
+    }
+
+    public void setFollowRedirects(boolean followRedirects) {
+        this.followRedirects = followRedirects;
+    }
 }

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

@@ -27,10 +27,13 @@ public class HTTPRequest {
     private byte[] responseBody;
     private int status;
 
+    private boolean followRedirects;
+
     public HTTPRequest(HTTPClient client, String method, String path){
         this.client = client;
         this.method = method;
         this.path = path;
+        this.followRedirects = client.isFollowingRedirects();
         for(String key : client.getDefaultQuery().keySet())
             query(key, client.getDefaultQuery().get(key));
         for(String key : client.getDefaultHeaders().keySet())
@@ -112,6 +115,10 @@ public HTTPRequest bearer(String token){
         return authorization("Bearer", token);
     }
 
+    public HTTPRequest tokenAuth(String token){
+        return authorization("token", token);
+    }
+
     public HTTPRequest jsonBody(Object object) {
         if(object instanceof AbstractElement)
             return jsonBodyElement((AbstractElement) object);
@@ -140,6 +147,10 @@ public String string(){
         return new String(bytes(), StandardCharsets.UTF_8);
     }
 
+    public String redirect(){
+        return header("Location");
+    }
+
     public <T> T object(Class<T> type) {
         if(type == null)
             return null;
@@ -154,9 +165,15 @@ public AbstractElement data() {
         String contentType = header("Content-Type");
         if(contentType == null)
             contentType = "application/json";
+
         switch (contentType){
             case "application/x-www-form-urlencoded":
-                AbstractElement.fromFormData(string());
+                return AbstractElement.fromFormData(string());
+            case "text/yaml":
+            case "text/x-yaml":
+            case "application/yaml":
+            case "application/x-yaml":
+                return AbstractElement.fromYaml(string());
         }
         return AbstractElement.fromJson(string());
     }
@@ -167,7 +184,7 @@ public String header(String key) {
     }
 
     public String[] headers(String key) {
-        String[] values = responseHeaders.get(key);
+        String[] values = responseHeaders.get(key.toLowerCase(Locale.ROOT));
         return values == null ? new String[0] : values;
     }
 
@@ -200,6 +217,7 @@ public void checkServerTrusted(X509Certificate[] certs, String authType) {
             conn.setConnectTimeout(5000);
             conn.setRequestMethod(method);
             conn.setDoInput(true);
+            conn.setInstanceFollowRedirects(followRedirects);
             for(String k : requestHeaders.keySet()){
                 for(String v : requestHeaders.get(k))
                     conn.addRequestProperty(k, v);
@@ -215,7 +233,7 @@ public void checkServerTrusted(X509Certificate[] certs, String authType) {
                 conn.addRequestProperty("Cookie", String.join("; ", reqCookies));
 
             if (client.getBeforeInterceptor() != null)
-                client.getBeforeInterceptor().doBefore(this);
+                client.getBeforeInterceptor().intercept(this);
 
 
             if(requestBody!=null){
@@ -245,6 +263,11 @@ public void checkServerTrusted(X509Certificate[] certs, String authType) {
             }else{
                 this.responseBody = readAll(conn.getInputStream());
             }
+
+
+            if (client.getAfterInterceptor() != null)
+                client.getAfterInterceptor().intercept(this);
+
             return this;
         }catch(Exception e){
             try {
@@ -277,6 +300,14 @@ private static byte[] readAll(InputStream is) throws IOException {
         return baos.toByteArray();
     }
 
+    public void setFollowRedirects(boolean followRedirects) {
+        this.followRedirects = followRedirects;
+    }
+
+    public boolean isFollowingRedirects() {
+        return followRedirects;
+    }
+
     public String toString(){
         return string();
     }

…nterceptor/BeforeRequestInterceptor.java …ient/interceptor/RequestInterceptor.javasrc/main/java/org/javawebstack/httpclient/interceptor/BeforeRequestInterceptor.java renamed to src/main/java/org/javawebstack/httpclient/interceptor/RequestInterceptor.java src/main/java/org/javawebstack/httpclient/interceptor/BeforeRequestInterceptor.java renamed to src/main/java/org/javawebstack/httpclient/interceptor/RequestInterceptor.java

@@ -2,6 +2,6 @@
 
 import org.javawebstack.httpclient.HTTPRequest;
 
-public interface BeforeRequestInterceptor {
-    void doBefore(HTTPRequest request);
+public interface RequestInterceptor {
+    void intercept(HTTPRequest request);
 }