healthcare API: add missing variable names, change dicomStore to fhirStore in FHIR (GoogleCloudPlatform#2855)

noerog · web-flow · commit bd87a1b9fff5 · 2020-05-07T15:08:47.000-07:00
diff --git a/healthcare/v1/src/main/java/snippets/healthcare/dicom/DicomStorePatch.java b/healthcare/v1/src/main/java/snippets/healthcare/dicom/DicomStorePatch.java
@@ -32,6 +32,7 @@
 import java.util.Collections;
 
 public class DicomStorePatch {
+  private static final String DICOM_NAME = "projects/%s/locations/%s/datasets/%s/dicomStores/%s";
   private static final JsonFactory JSON_FACTORY = new JacksonFactory();
   private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
 
diff --git a/healthcare/v1/src/main/java/snippets/healthcare/dicom/DicomWebRetrieveRendered.java b/healthcare/v1/src/main/java/snippets/healthcare/dicom/DicomWebRetrieveRendered.java
@@ -38,7 +38,7 @@
 
 public class DicomWebRetrieveRendered {
   private static final String DICOM_NAME = "projects/%s/locations/%s/datasets/%s/dicomStores/%s";
-  private static final String DICOMWEB_PATH = "studies/%s/series/%s/instances/%s";
+  private static final String DICOMWEB_PATH = "studies/%s/series/%s/instances/%s/rendered";
   private static final JsonFactory JSON_FACTORY = new JacksonFactory();
   private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
 
diff --git a/healthcare/v1/src/main/java/snippets/healthcare/dicom/DicomWebSearchForInstances.java b/healthcare/v1/src/main/java/snippets/healthcare/dicom/DicomWebSearchForInstances.java
@@ -30,6 +30,7 @@
 import java.util.Collections;
 
 public class DicomWebSearchForInstances {
+  private static final String DICOM_NAME = "projects/%s/locations/%s/datasets/%s/dicomStores/%s";
   private static final JsonFactory JSON_FACTORY = new JacksonFactory();
   private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
 
diff --git a/healthcare/v1/src/main/java/snippets/healthcare/dicom/DicomWebSearchStudies.java b/healthcare/v1/src/main/java/snippets/healthcare/dicom/DicomWebSearchStudies.java
@@ -30,6 +30,7 @@
 import java.util.Collections;
 
 public class DicomWebSearchStudies {
+  private static final String DICOM_NAME = "projects/%s/locations/%s/datasets/%s/dicomStores/%s";
   private static final JsonFactory JSON_FACTORY = new JacksonFactory();
   private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
 
diff --git a/healthcare/v1/src/main/java/snippets/healthcare/fhir/FhirStorePatch.java b/healthcare/v1/src/main/java/snippets/healthcare/fhir/FhirStorePatch.java
@@ -36,7 +36,7 @@ public class FhirStorePatch {
   private static final JsonFactory JSON_FACTORY = new JacksonFactory();
   private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
 
-  public static void fhirStorePatch(String dicomStoreName, String pubsubTopic) throws IOException {
+  public static void fhirStorePatch(String fhirStoreName, String pubsubTopic) throws IOException {
     // String fhirStoreName =
     //    String.format(
     //        FHIR_NAME, "your-project-id", "your-region-id", "your-dataset-id", "your-fhir-id");
@@ -47,7 +47,7 @@ public static void fhirStorePatch(String dicomStoreName, String pubsubTopic) thr
 
     // Fetch the initial state of the FHIR store.
     FhirStores.Get getRequest =
-        client.projects().locations().datasets().fhirStores().get(dicomStoreName);
+        client.projects().locations().datasets().fhirStores().get(fhirStoreName);
     FhirStore store = getRequest.execute();
 
     // Update the FhirStore fields as needed as needed. For a full list of FhirStore fields, see:
@@ -61,7 +61,7 @@ public static void fhirStorePatch(String dicomStoreName, String pubsubTopic) thr
             .locations()
             .datasets()
             .fhirStores()
-            .patch(dicomStoreName, store)
+            .patch(fhirStoreName, store)
             .setUpdateMask("notificationConfig");
 
     // Execute the request and process the results.
