Rename FhirResourceGetHistory -> FhirResourceListHistory, implement FhirResourceGetHistory. (#2456)

* Rename FhirResourceGetHistory -> FhirResourceListHistory, implement FhirResourceGetHistory.

* Resolve #2456.

* Use Java 11, and GSON in FhirResourceTests.

Author: dzlier-gcp

healthcare/v1beta1/pom.xml

@@ -6,6 +6,18 @@
   <groupId>com.google.samples</groupId>
   <artifactId>healthcare-samples</artifactId>
   <version>1.0-SNAPSHOT</version>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>11</source>
+          <target>11</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <packaging>jar</packaging>
 
   <!--
@@ -20,8 +32,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
   </properties>
 
   <prerequisites>
@@ -47,7 +59,7 @@
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-healthcare</artifactId>
-      <version>v1beta1-rev20200229-1.30.9</version>
+      <version>v1beta1-rev20200301-1.30.9</version>
     </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>

healthcare/v1beta1/src/main/java/snippets/healthcare/dicom/DicomWebSearchForInstances.java

@@ -18,7 +18,6 @@
 
 // [START healthcare_dicomweb_search_instances]
 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.HttpResponse;
 import com.google.api.client.http.javanet.NetHttpTransport;
@@ -27,7 +26,6 @@
 import com.google.api.services.healthcare.v1beta1.CloudHealthcare;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcare.Projects.Locations.Datasets.DicomStores;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcareScopes;
-
 import java.io.IOException;
 import java.util.Collections;
 

healthcare/v1beta1/src/main/java/snippets/healthcare/dicom/DicomWebStoreInstance.java

@@ -18,21 +18,18 @@
 
 // [START healthcare_dicomweb_store_instance]
 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;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcare;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcareScopes;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Collections;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;

healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/FhirStoreExecuteBundle.java

@@ -18,18 +18,15 @@
 
 // [START healthcare_fhir_execute_bundle]
 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;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcare;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcareScopes;
-
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collections;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;

healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceConditionalDelete.java

@@ -18,7 +18,6 @@
 
 // [START healthcare_conditional_delete_resource]
 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;

healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceConditionalPatch.java

@@ -18,18 +18,15 @@
 
 // [START healthcare_conditional_patch_resource]
 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;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcare;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcareScopes;
-
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collections;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;

healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceConditionalUpdate.java

@@ -18,18 +18,15 @@
 
 // [START healthcare_conditional_update_resource]
 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;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcare;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcareScopes;
-
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collections;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;

healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceCreate.java

@@ -18,18 +18,15 @@
 
 // [START healthcare_create_resource]
 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;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcare;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcareScopes;
-
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collections;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;

healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceDelete.java

@@ -18,18 +18,15 @@
 
 // [START healthcare_delete_resource]
 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;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcare;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcareScopes;
-
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collections;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;

healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceDeletePurge.java

@@ -18,18 +18,15 @@
 
 // [START healthcare_delete_resource_purge]
 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;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcare;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcareScopes;
-
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collections;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;

healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceGet.java

@@ -18,18 +18,15 @@
 
 // [START healthcare_get_resource]
 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;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcare;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcareScopes;
-
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collections;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;

healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceGetHistory.java

@@ -18,18 +18,15 @@
 
 // [START healthcare_get_resource_history]
 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;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcare;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcareScopes;
-
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collections;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -44,18 +41,19 @@ public class FhirResourceGetHistory {
   private static final JsonFactory JSON_FACTORY = new JacksonFactory();
   private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport();
 
-  public static void fhirResourceGetHistory(String resourceName)
+  public static void fhirResourceGetHistory(String resourceName, String versionId)
       throws IOException, URISyntaxException {
     // String resourceName =
     //    String.format(
     //        FHIR_NAME, "project-id", "region-id", "dataset-id", "store-id", "fhir-id");
+    // String versionId = "version-uuid"
 
     // Initialize the client, which will be used to interact with the service.
     CloudHealthcare client = createClient();
 
     HttpClient httpClient = HttpClients.createDefault();
     String uri = String.format(
-        "%sv1beta1/%s/_history", client.getRootUrl(), resourceName);
+        "%sv1beta1/%s/_history/%s", client.getRootUrl(), resourceName, versionId);
     URIBuilder uriBuilder = new URIBuilder(uri)
         .setParameter("access_token", getAccessToken());
 
@@ -76,7 +74,7 @@ public static void fhirResourceGetHistory(String resourceName)
       responseEntity.writeTo(System.err);
       throw new RuntimeException();
     }
-    System.out.println("FHIR resource history retrieved: ");
+    System.out.println("FHIR resource history list retrieved: ");
     responseEntity.writeTo(System.out);
   }
 
@@ -91,8 +89,8 @@ private static CloudHealthcare createClient() throws IOException {
     HttpRequestInitializer requestInitializer =
         request -> {
           credential.initialize(request);
-          request.setConnectTimeout(60000); // 1 minute connect timeout
-          request.setReadTimeout(60000); // 1 minute read timeout
+          request.setConnectTimeout(1 * 60 * 1000); // 1 minute connect timeout
+          request.setReadTimeout(1 * 60 * 1000); // 1 minute read timeout
         };
 
     // Build the client for interacting with the service.

healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceGetMetadata.java

@@ -18,7 +18,6 @@
 
 // [START healthcare_get_metadata]
 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;
@@ -27,7 +26,6 @@
 import com.google.api.services.healthcare.v1beta1.CloudHealthcare.Projects.Locations.Datasets.FhirStores.Fhir.Capabilities;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcareScopes;
 import com.google.api.services.healthcare.v1beta1.model.HttpBody;
-
 import java.io.IOException;
 import java.util.Collections;
 

healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceGetPatientEverything.java

@@ -18,18 +18,15 @@
 
 // [START healthcare_get_patient_everything]
 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;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcare;
 import com.google.api.services.healthcare.v1beta1.CloudHealthcareScopes;
-
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collections;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;