Fix character encoding for binary files

hms-dbmi · Jan 29, 2025 · 9c3658e · 9c3658e
1 parent 81cf6ae
commit 9c3658e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...-sure-resource-api/src/main/java/edu/harvard/dbmi/avillach/service/ResourceWebClient.java b/...-sure-resource-api/src/main/java/edu/harvard/dbmi/avillach/service/ResourceWebClient.java
@@ -241,16 +241,15 @@ public Response queryResult(String rsURL, String queryId, QueryRequest queryRequ
                 HttpClientUtil.composeURL(rsURL, pathName), createHeaders(queryRequest.getResourceCredentials()), body
             );
 
+            byte[] content = httpClientUtil.readBytesFromResponse(resourcesResponse);
             if (resourcesResponse.getStatusLine().getStatusCode() != 200) {
                 logger.error("ResourceRS did not return a 200");
                 HttpClientUtil.throwResponseError(resourcesResponse, rsURL);
             }
-            return Response.ok(resourcesResponse.getEntity().getContent()).build();
+            return Response.ok(content).build();
         } catch (JsonProcessingException e) {
             logger.error("Unable to encode resource credentials");
             throw new NotAuthorizedException("Unable to encode resource credentials", e);
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
         } finally {
             closeHttpResponse(resourcesResponse);
         }

diff --git a/pic-sure-util/src/main/java/edu/harvard/dbmi/avillach/util/HttpClientUtil.java b/pic-sure-util/src/main/java/edu/harvard/dbmi/avillach/util/HttpClientUtil.java
@@ -150,6 +150,17 @@ public String readObjectFromResponse(HttpResponse response, Charset charset) {
         }
     }
 
+    public byte[] readBytesFromResponse(HttpResponse response) {
+        logger.debug("HttpClientUtil readObjectFromResponse(HttpResponse response)");
+        try {
+            byte[] responseBody = EntityUtils.toByteArray(response.getEntity());
+            logger.debug("readObjectFromResponse() responseBody {}", responseBody);
+            return responseBody;
+        } catch (IOException e) {
+            throw new ApplicationException("Incorrect object type returned", e);
+        }
+    }
+
     public static <T> T readObjectFromResponse(HttpResponse response, Class<T> expectedElementType) {
         logger.debug("HttpClientUtil readObjectFromResponse()");
         try {