healthcare API: update Pub/Sub URI and fix FhirResourceDeletePurge formatting/test (GoogleCloudPlatform#5729)

noerog · web-flow · commit 7a3f33295670 · 2021-08-03T09:54:28.000-10:00
* healthcare API: update Pub/Sub topic example to use fully qualified URI

* fix FhirResourceDeletePurge resource path

* fix lint
diff --git a/healthcare/v1/src/main/java/snippets/healthcare/dicom/DicomStorePatch.java b/healthcare/v1/src/main/java/snippets/healthcare/dicom/DicomStorePatch.java
@@ -40,7 +40,7 @@ public static void patchDicomStore(String dicomStoreName, String pubsubTopic) th
     // String dicomStoreName =
     //    String.format(
     //        DICOM_NAME, "your-project-id", "your-region-id", "your-dataset-id", "your-dicom-id");
-    // String pubsubTopic = "your-pubsub-topic";
+    // String pubsubTopic = "projects/your-project-id/topics/your-pubsub-topic";
 
     // Initialize the client, which will be used to interact with the service.
     CloudHealthcare client = createClient();
diff --git a/healthcare/v1/src/main/java/snippets/healthcare/fhir/FhirStorePatch.java b/healthcare/v1/src/main/java/snippets/healthcare/fhir/FhirStorePatch.java
@@ -40,7 +40,7 @@ public static void fhirStorePatch(String fhirStoreName, String pubsubTopic) thro
     // String fhirStoreName =
     //    String.format(
     //        FHIR_NAME, "your-project-id", "your-region-id", "your-dataset-id", "your-fhir-id");
-    // String pubsubTopic = "your-pubsub-topic";
+    // String pubsubTopic = "projects/your-project-id/topics/your-pubsub-topic";
 
     // Initialize the client, which will be used to interact with the service.
     CloudHealthcare client = createClient();
diff --git a/healthcare/v1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceDeletePurge.java b/healthcare/v1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceDeletePurge.java
@@ -39,15 +39,16 @@
 
 public class FhirResourceDeletePurge {
   private static final String FHIR_NAME =
-      "projects/%s/locations/%s/datasets/%s/fhirStores/%s/fhir/%s";
+      "projects/%s/locations/%s/datasets/%s/fhirStores/%s/fhir/%s/%s";
   private static final JsonFactory JSON_FACTORY = new JacksonFactory();
   private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
 
   public static void fhirResourceDeletePurge(String resourceName)
       throws IOException, URISyntaxException {
     // String resourceName =
     //    String.format(
-    //        FHIR_NAME, "project-id", "region-id", "dataset-id", "store-id", "fhir-id");
+    //        FHIR_NAME, "project-id", "region-id", "dataset-id", "store-id", "resource-type",
+    // "resource-id");
 
     // Initialize the client, which will be used to interact with the service.
     CloudHealthcare client = createClient();
@@ -75,7 +76,7 @@ public static void fhirResourceDeletePurge(String resourceName)
       responseEntity.writeTo(System.err);
       throw new RuntimeException(errorMessage);
     }
-    System.out.println("FHIR resource history purged.");
+    System.out.println("FHIR resource history purged (excluding current version).");
     responseEntity.writeTo(System.out);
   }
 
@@ -104,7 +105,7 @@ private static String getAccessToken() throws IOException {
     GoogleCredentials credential =
         GoogleCredentials.getApplicationDefault()
             .createScoped(Collections.singleton(CloudHealthcareScopes.CLOUD_PLATFORM));
-    
+
     return credential.refreshAccessToken().getTokenValue();
   }
 }
diff --git a/healthcare/v1/src/main/java/snippets/healthcare/hl7v2/Hl7v2StorePatch.java b/healthcare/v1/src/main/java/snippets/healthcare/hl7v2/Hl7v2StorePatch.java
@@ -42,7 +42,7 @@ public static void patchHl7v2Store(String hl7v2StoreName, String pubsubTopic) th
     // String hl7v2StoreName =
     //    String.format(
     //        HL7v2_NAME, "your-project-id", "your-region-id", "your-dataset-id", "your-hl7v2-id");
-    // String pubsubTopic = "your-pubsub-topic";
+    // String pubsubTopic = "projects/your-project-id/topics/your-pubsub-topic";
 
     // Initialize the client, which will be used to interact with the service.
     CloudHealthcare client = createClient();
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/FhirResourceTests.java b/healthcare/v1/src/test/java/snippets/healthcare/FhirResourceTests.java
@@ -199,14 +199,6 @@ public void test_FhirResourceGetPatientEverything() throws Exception {
     assertThat(output, containsString("Patient compartment results:"));
   }
 
-  @Test
-  public void test_FhirResourceDelete() throws Exception {
-    FhirResourceDelete.fhirResourceDelete(fhirResourceName);
-
-    String output = bout.toString();
-    assertThat(output, containsString("FHIR resource deleted."));
-  }
-
   @Test
   public void test_FhirResourceGetHistory() throws Exception {
     JsonObject json = new JsonObject();
@@ -251,10 +243,17 @@ public void test_DeletePurgeFhirResource() throws Exception {
     JsonArray jarray = new JsonArray();
     jarray.add(json);
     FhirResourcePatch.fhirResourcePatch(fhirResourceName, jarray.toString());
-    FhirResourceDelete.fhirResourceDelete(fhirResourceName);
     FhirResourceDeletePurge.fhirResourceDeletePurge(fhirResourceName);
 
     String output = bout.toString();
-    assertThat(output, containsString("FHIR resource history purged."));
+    assertThat(output, containsString("FHIR resource history purged (excluding current version)."));
+  }
+
+  @Test
+  public void test_FhirResourceDelete() throws Exception {
+    FhirResourceDelete.fhirResourceDelete(fhirResourceName);
+
+    String output = bout.toString();
+    assertThat(output, containsString("FHIR resource deleted."));
   }
 }
