fix: HttpException with RequestResponse

Author: florianepitech

pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>20.0</version>
         </dependency>
         <!-- Json -->
         <dependency>

src/main/java/net/httpclient/wrapper/exception/HttpClientException.java

@@ -1,10 +1,16 @@
 package net.httpclient.wrapper.exception;
 
+import net.httpclient.wrapper.response.RequestResponse;
 import org.apache.http.HttpResponse;
 
 public class HttpClientException extends HttpException {
 
-    public HttpClientException(HttpResponse httpResponse) {
+    /**
+     * This exception is throw when the code of the response
+     * is between 400 and 499 included.
+     * @param httpResponse The response from the server.
+     */
+    public HttpClientException(RequestResponse httpResponse) {
         super(httpResponse);
     }
 

src/main/java/net/httpclient/wrapper/exception/HttpException.java

@@ -1,22 +1,21 @@
 package net.httpclient.wrapper.exception;
 
+import net.httpclient.wrapper.response.RequestResponse;
 import org.apache.http.HttpResponse;
 
-public class HttpException extends Exception {
+import java.io.IOException;
 
-    private final HttpResponse httpResponse;
+public class HttpException extends Exception {
 
-    public HttpException(HttpResponse httpResponse) {
-        super("Http request return status code : " + httpResponse.getStatusLine().getStatusCode());
-        this.httpResponse = httpResponse;
-    }
+    private final RequestResponse requestResponse;
 
-    public HttpResponse getHttpResponse() {
-        return (httpResponse);
+    public HttpException(RequestResponse requestResponse) {
+        super("Http request return status code : " + requestResponse.getStatusCode());
+        this.requestResponse = requestResponse;
     }
 
-    public int getStatusCode() {
-        return (getHttpResponse().getStatusLine().getStatusCode());
+    public RequestResponse getRequestResponse() throws IOException {
+        return (requestResponse);
     }
 
 }

src/main/java/net/httpclient/wrapper/exception/HttpServerException.java

@@ -1,10 +1,16 @@
 package net.httpclient.wrapper.exception;
 
+import net.httpclient.wrapper.response.RequestResponse;
 import org.apache.http.HttpResponse;
 
 public class HttpServerException extends HttpException {
 
-    public HttpServerException(HttpResponse httpResponse) {
+    /**
+     * This exception is throw when the code of the response
+     * is between 500 and 599 included.
+     * @param httpResponse The response from the server.
+     */
+    public HttpServerException(RequestResponse httpResponse) {
         super(httpResponse);
     }
 

src/main/java/net/httpclient/wrapper/session/HttpClientSessionBasic.java

@@ -78,6 +78,7 @@ public RequestConfig.Builder setRequestConfig() {
 
     public void resetHttpClient() {
         try {
+            this.httpCookieStore.clear();
             this.httpClient = newHttpClient();
         } catch (NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) {
             throw new RuntimeException(e);
@@ -124,7 +125,7 @@ public RequestResponse sendGet(String url) throws IOException, HttpClientExcepti
         httpGet.setConfig(getRequestConfig().build());
         httpGet.addHeader(HttpHeaders.ACCEPT, "application/json, text/plain, */*");
         HttpResponse httpResponse = getHttpClient().execute(httpGet);
-        assertRequest(httpResponse);
+        assertRequest(httpResponse, start);
         return (new RequestResponse(httpResponse, start));
     }
 
@@ -136,7 +137,7 @@ public RequestResponse sendPost(String url, String content, ContentType contentT
         httpPost.addHeader(HttpHeaders.ACCEPT, "application/json, text/plain, */*");
         httpPost.setEntity(new StringEntity(content));
         HttpResponse httpResponse = getHttpClient().execute(httpPost);
-        assertRequest(httpResponse);
+        assertRequest(httpResponse, start);
         return (new RequestResponse(httpResponse, start));
     }
 
@@ -148,7 +149,7 @@ public RequestResponse sendForm(String url, List<NameValuePair> form) throws IOE
         UrlEncodedFormEntity entity = new UrlEncodedFormEntity(form, Consts.UTF_8);
         httpPost.setEntity(entity);
         HttpResponse httpResponse = httpClient.execute(httpPost);
-        assertRequest(httpResponse);
+        assertRequest(httpResponse, start);
         return (new RequestResponse(httpResponse, start));
     }
 
@@ -158,7 +159,7 @@ public RequestResponse sendDelete(String url) throws IOException, HttpClientExce
         httpDelete.setConfig(getRequestConfig().build());
         httpDelete.addHeader(HttpHeaders.ACCEPT, "application/json, text/plain, */*");
         HttpResponse httpResponse = httpClient.execute(httpDelete);
-        assertRequest(httpResponse);
+        assertRequest(httpResponse, start);
         return (new RequestResponse(httpResponse, start));
     }
 
@@ -170,16 +171,16 @@ public RequestResponse sendPut(String url, String content, ContentType contentTy
         httpPut.addHeader(HttpHeaders.ACCEPT, "application/json, text/plain, */*");
         httpPut.setEntity(new StringEntity(content));
         HttpResponse httpResponse = getHttpClient().execute(httpPut);
-        assertRequest(httpResponse);
+        assertRequest(httpResponse, start);
         return (new RequestResponse(httpResponse, start));
     }
 
-    private void assertRequest(HttpResponse httpResponse) throws HttpClientException, HttpServerException {
+    private void assertRequest(HttpResponse httpResponse, Date startDate) throws HttpClientException, HttpServerException, IOException {
         int statusCode = httpResponse.getStatusLine().getStatusCode();
         if (statusCode >= 500 && statusCode <= 599)
-            throw new HttpServerException(httpResponse);
+            throw new HttpServerException(new RequestResponse(httpResponse, startDate));
         else if (statusCode >= 400 && statusCode <= 499)
-            throw new HttpClientException(httpResponse);
+            throw new HttpClientException(new RequestResponse(httpResponse, startDate));
     }
 
     /*