Fix character encoding for binary files

hms-dbmi · Jan 29, 2025 · a25e4f9 · a25e4f9
1 parent 9c3658e
commit a25e4f9
Showing 1 changed file with 11 additions and 2 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
@@ -20,8 +20,7 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.io.UncheckedIOException;
+import java.io.*;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
@@ -242,6 +241,12 @@ public Response queryResult(String rsURL, String queryId, QueryRequest queryRequ
             );
 
             byte[] content = httpClientUtil.readBytesFromResponse(resourcesResponse);
+            FileOutputStream fos = new FileOutputStream("/tmp/test.avro");
+            fos.write(content);
+
+            String contentString = new String(content, StandardCharsets.ISO_8859_1);
+            logger.info("Query result:");
+            logger.info(contentString);
             if (resourcesResponse.getStatusLine().getStatusCode() != 200) {
                 logger.error("ResourceRS did not return a 200");
                 HttpClientUtil.throwResponseError(resourcesResponse, rsURL);
@@ -250,6 +255,10 @@ public Response queryResult(String rsURL, String queryId, QueryRequest queryRequ
         } catch (JsonProcessingException e) {
             logger.error("Unable to encode resource credentials");
             throw new NotAuthorizedException("Unable to encode resource credentials", e);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         } finally {
             closeHttpResponse(resourcesResponse);
         }