healthcare API: change how HL7v2MessageList processes results, fix er… (#2870)

* healthcare API: change how HL7v2MessageList processes results, fix error in a path name in HL7v2MessageGet

* remove unused imports

* remove newline

* fix some paths for dataset and HL7v2 IAM methods

* fix lint

Author: noerog

healthcare/v1/src/main/java/snippets/healthcare/datasets/DatasetSetIamPolicy.java

@@ -34,6 +34,7 @@
 import java.util.Collections;
 
 public class DatasetSetIamPolicy {
+  private static final String DATASET_NAME = "projects/%s/locations/%s/datasets/%s";
   private static final JsonFactory JSON_FACTORY = new JacksonFactory();
   private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
 

healthcare/v1/src/main/java/snippets/healthcare/hl7v2/Hl7v2StoreGetIamPolicy.java

@@ -31,7 +31,7 @@
 import java.util.Collections;
 
 public class Hl7v2StoreGetIamPolicy {
-  private static final String DATASET_NAME = "projects/%s/locations/%s/datasets/%s";
+  private static final String HL7v2_NAME = "projects/%s/locations/%s/datasets/%s/hl7V2Stores/%s";
   private static final JsonFactory JSON_FACTORY = new JacksonFactory();
   private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
 

healthcare/v1/src/main/java/snippets/healthcare/hl7v2/messages/HL7v2MessageGet.java

@@ -18,7 +18,6 @@
 
 // [START healthcare_get_hl7v2_message]
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.http.HttpHeaders;
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.JsonFactory;
@@ -32,7 +31,7 @@
 
 public class HL7v2MessageGet {
   private static final String MESSAGE_NAME =
-      "projects/%s/locations/%s/datasets/%s/hl7V2Store/%s/messages/%s";
+      "projects/%s/locations/%s/datasets/%s/hl7V2Stores/%s/messages/%s";
   private static final JsonFactory JSON_FACTORY = new JacksonFactory();
   private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
 

healthcare/v1/src/main/java/snippets/healthcare/hl7v2/messages/HL7v2MessageList.java

@@ -28,10 +28,7 @@
 import com.google.api.services.healthcare.v1.model.ListMessagesResponse;
 import com.google.api.services.healthcare.v1.model.Message;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 
 public class HL7v2MessageList {
   private static final String HL7v2_NAME = "projects/%s/locations/%s/datasets/%s/hl7V2Stores/%s";
@@ -48,10 +45,9 @@ public static void hl7v2MessageList(String hl7v2StoreName) throws IOException {
 
     // Results are paginated, so multiple queries may be required.
     String pageToken = null;
-    List<Message> messages = new ArrayList<>();
 
-    do {
-      // Create request and configure any parameters.
+    // Create request and configure any parameters.
+    try {
       Messages.List request =
           client
               .projects()
@@ -63,21 +59,21 @@ public static void hl7v2MessageList(String hl7v2StoreName) throws IOException {
               .setPageSize(100) // Specify pageSize up to 1000
               .setPageToken(pageToken);
 
+      ListMessagesResponse response;
       // Execute response and collect results.
-      ListMessagesResponse response = request.execute();
-      Collection<Message> responseMessages = response.getHl7V2Messages();
-      if (responseMessages != null) {
-        messages.addAll(responseMessages);
-      }
-
-      // Update the page token for the next request.
-      pageToken = response.getNextPageToken();
-    } while (pageToken != null);
-
-    // Print results.
-    System.out.printf("Retrieved %s HL7v2 messages: \n", messages.size());
-    for (Message data : messages) {
-      System.out.println("\t" + data.getData());
+      do {
+        response = request.execute();
+        if (response.getHl7V2Messages() == null) {
+          continue;
+        }
+        System.out.printf("Retrieved %s HL7v2 messages: \n", response.getHl7V2Messages().size());
+        for (Message message : response.getHl7V2Messages()) {
+          System.out.println("\t" + message);
+        }
+        request.setPageToken(response.getNextPageToken());
+      } while (response.getNextPageToken() != null);
+    } catch (IOException e) {
+      System.out.println("Unable to list HL7v2 messages:" + e.toString());
     }
   }