Merge pull request #18 from sashirestela/17-issue-handling-errors-when-response-is-inputstream

Issue handling errors when response is inputstream

Author: sashirestela

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>io.github.sashirestela</groupId>
   <artifactId>cleverclient</artifactId>
-  <version>0.8.0</version>
+  <version>0.8.1</version>
   <packaging>jar</packaging>
 
   <name>cleverclient</name>

src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncBinarySender.java

@@ -1,5 +1,6 @@
 package io.github.sashirestela.cleverclient.sender;
 
+import java.io.InputStream;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse.BodyHandlers;
@@ -15,7 +16,7 @@ public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest,
 
         return httpResponseFuture.thenApply(response -> {
 
-            throwExceptionIfErrorIsPresent(response, false);
+            throwExceptionIfErrorIsPresent(response, InputStream.class);
 
             logger.debug("Response : {}", response.body());
 

src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncGenericSender.java

@@ -16,7 +16,7 @@ public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest,
 
         return httpResponseFuture.thenApply(response -> {
 
-            throwExceptionIfErrorIsPresent(response, false);
+            throwExceptionIfErrorIsPresent(response, null);
 
             logger.debug("Response : {}", response.body());
 

src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncListSender.java

@@ -16,7 +16,7 @@ public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest,
 
         return httpResponseFuture.thenApply(response -> {
 
-            throwExceptionIfErrorIsPresent(response, false);
+            throwExceptionIfErrorIsPresent(response, null);
 
             logger.debug("Response : {}", response.body());
 

src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncObjectSender.java

@@ -16,7 +16,7 @@ public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest,
 
         return httpResponseFuture.thenApply(response -> {
 
-            throwExceptionIfErrorIsPresent(response, false);
+            throwExceptionIfErrorIsPresent(response, null);
 
             logger.debug("Response : {}", response.body());
 

src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncPlainTextSender.java

@@ -15,7 +15,7 @@ public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest,
 
         return httpResponseFuture.thenApply(response -> {
 
-            throwExceptionIfErrorIsPresent(response, false);
+            throwExceptionIfErrorIsPresent(response, null);
 
             logger.debug("Response : {}", response.body());
 

src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncStreamSender.java

@@ -3,6 +3,7 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse.BodyHandlers;
+import java.util.stream.Stream;
 
 import io.github.sashirestela.cleverclient.support.CleverClientSSE;
 import io.github.sashirestela.cleverclient.util.JsonUtil;
@@ -17,7 +18,7 @@ public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest,
 
         return httpResponseFuture.thenApply(response -> {
 
-            throwExceptionIfErrorIsPresent(response, true);
+            throwExceptionIfErrorIsPresent(response, Stream.class);
 
             return response.body()
                     .peek(rawData -> logger.debug("Response : {}", rawData))

src/main/java/io/github/sashirestela/cleverclient/sender/HttpSender.java

@@ -1,9 +1,12 @@
 package io.github.sashirestela.cleverclient.sender;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -20,13 +23,19 @@ public abstract <S, T> Object sendRequest(HttpClient httpClient, HttpRequest htt
             Class<S> genericClass);
 
     @SuppressWarnings("unchecked")
-    protected void throwExceptionIfErrorIsPresent(HttpResponse<?> response, boolean isStream) {
+    protected void throwExceptionIfErrorIsPresent(HttpResponse<?> response, Class<?> clazz) {
         logger.debug("Response Code : {}", response.statusCode());
         if (!CommonUtil.isInHundredsOf(response.statusCode(), HttpURLConnection.HTTP_OK)) {
             var data = "";
-            if (isStream) {
+            if (Stream.class.equals(clazz)) {
                 data = ((Stream<String>) response.body())
                         .collect(Collectors.joining(System.getProperty("line.separator")));
+            } else if (InputStream.class.equals(clazz)) {
+                try {
+                    data = new String(((InputStream) response.body()).readAllBytes(), StandardCharsets.UTF_8);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             } else {
                 data = (String) response.body();
             }

src/main/java/io/github/sashirestela/cleverclient/sender/HttpSyncBinarySender.java

@@ -1,6 +1,7 @@
 package io.github.sashirestela.cleverclient.sender;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse.BodyHandlers;
@@ -16,7 +17,7 @@ public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest,
 
             var httpResponse = httpClient.send(httpRequest, BodyHandlers.ofInputStream());
 
-            throwExceptionIfErrorIsPresent(httpResponse, false);
+            throwExceptionIfErrorIsPresent(httpResponse, InputStream.class);
 
             var rawData = httpResponse.body();
 

src/main/java/io/github/sashirestela/cleverclient/sender/HttpSyncGenericSender.java

@@ -17,7 +17,7 @@ public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest,
 
             var httpResponse = httpClient.send(httpRequest, BodyHandlers.ofString());
 
-            throwExceptionIfErrorIsPresent(httpResponse, false);
+            throwExceptionIfErrorIsPresent(httpResponse, null);
 
             var rawData = httpResponse.body();