Change retrieved study output file to use .multipart extension and add Accept headers (GoogleCloudPlatform#1554)

noerog · lesv · commit ad6550ddca10 · 2019-08-23T13:40:51.000-07:00
* Change retrieved study output file to use .multipart extension

* Address review comments

* Add Accept headers to retrieve study request.

* Address review comments/fix missing character

* Fix style

* Remove X-GFE-SSL yes header.
diff --git a/healthcare/v1beta1/src/main/java/snippets/healthcare/dicom/DicomWebRetrieveStudy.java b/healthcare/v1beta1/src/main/java/snippets/healthcare/dicom/DicomWebRetrieveStudy.java
@@ -65,7 +65,10 @@ public static void dicomWebRetrieveStudy(String dicomStoreName, String studyId)
     // Execute the request and process the results.
     HttpResponse response = request.executeUnparsed();
 
-    String outputPath = "study.dcm";
+    // When specifying the output file, use an extension like ".multipart".
+    // Then, parse the downloaded multipart file to get each individual
+    // DICOM file.
+    String outputPath = "study.multipart";
     OutputStream outputStream = new FileOutputStream(new File(outputPath));
     try {
       response.download(outputStream);
@@ -90,11 +93,20 @@ private static CloudHealthcare createClient() throws IOException {
         GoogleCredential.getApplicationDefault(HTTP_TRANSPORT, JSON_FACTORY)
             .createScoped(Collections.singleton(CloudHealthcareScopes.CLOUD_PLATFORM));
 
+    HttpHeaders headers = new HttpHeaders();
+    // The response's default transfer syntax is Little Endian Explicit.
+    // As a result, if the file was uploaded using a compressed transfer syntax,
+    // the returned object will be decompressed. This can negatively impact performance and lead
+    // to errors for transfer syntaxes that the Cloud Healthcare API doesn't support.
+    // To avoid these issues, and if the returned object's transfer syntax doesn't matter to
+    // your application, use the
+    // multipart/related; type="application/dicom"; transfer-syntax=* Accept Header.
+    headers.setAccept("multipart/related; type=application/dicom; transfer-syntax=*");
     // Create a HttpRequestInitializer, which will provide a baseline configuration to all requests.
     HttpRequestInitializer requestInitializer =
         request -> {
           credential.initialize(request);
-          request.setHeaders(new HttpHeaders().set("X-GFE-SSL", "yes"));
+          request.setHeaders(headers);
           request.setConnectTimeout(60000); // 1 minute connect timeout
           request.setReadTimeout(60000); // 1 minute read timeout
         };
diff --git a/healthcare/v1beta1/src/test/java/snippets/healthcare/DicomWebTests.java b/healthcare/v1beta1/src/test/java/snippets/healthcare/DicomWebTests.java
@@ -63,7 +63,7 @@ public class DicomWebTests {
 
   private static String instanceOutput = "instance.dcm";
   private static String renderedOutput = "image.png";
-  private static String studyOutput = "study.dcm";
+  private static String studyOutput = "study.multipart";
 
   private File outputFile;
 
