From 73951b15b68806b39dde645fdca2a24ed6468440 Mon Sep 17 00:00:00 2001 From: Dane Zeke Liergaard Date: Fri, 20 Mar 2020 16:04:39 -0700 Subject: [PATCH 1/3] Rename FhirResourceGetHistory -> FhirResourceListHistory, implement FhirResourceGetHistory. --- .../resources/FhirResourceGetHistory.java | 11 +- .../resources/FhirResourceListHistory.java | 111 ++++++++++++++++++ .../healthcare/FhirResourceTests.java | 20 +++- 3 files changed, 136 insertions(+), 6 deletions(-) create mode 100644 healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceListHistory.java diff --git a/healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceGetHistory.java b/healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceGetHistory.java index 52c2aacda91..d9927a76ee2 100644 --- a/healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceGetHistory.java +++ b/healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceGetHistory.java @@ -44,18 +44,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 +77,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 +92,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. diff --git a/healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceListHistory.java b/healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceListHistory.java new file mode 100644 index 00000000000..467dbd76894 --- /dev/null +++ b/healthcare/v1beta1/src/main/java/snippets/healthcare/fhir/resources/FhirResourceListHistory.java @@ -0,0 +1,111 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package snippets.healthcare.fhir.resources; + +// [START healthcare_list_resource_history] + +import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; +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 org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.client.methods.RequestBuilder; +import org.apache.http.client.utils.URIBuilder; +import org.apache.http.impl.client.HttpClients; + +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Collections; + +public class FhirResourceListHistory { + private static final String FHIR_NAME = "projects/%s/locations/%s/datasets/%s/fhirStores/%s"; + private static final JsonFactory JSON_FACTORY = new JacksonFactory(); + private static final NetHttpTransport HTTP_TRANSPORT = new NetHttpTransport(); + + public static void fhirResourceListHistory(String resourceName) + throws IOException, URISyntaxException { + // String resourceName = + // String.format( + // FHIR_NAME, "project-id", "region-id", "dataset-id", "store-id", "fhir-id"); + + // 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); + URIBuilder uriBuilder = new URIBuilder(uri) + .setParameter("access_token", getAccessToken()); + + HttpUriRequest request = RequestBuilder + .get() + .setUri(uriBuilder.build()) + .addHeader("Content-Type", "application/fhir+json") + .addHeader("Accept-Charset", "utf-8") + .addHeader("Accept", "application/fhir+json; charset=utf-8") + .build(); + + // Execute the request and process the results. + HttpResponse response = httpClient.execute(request); + HttpEntity responseEntity = response.getEntity(); + if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { + System.err.print(String.format( + "Exception retrieving FHIR history: %s\n", response.getStatusLine().toString())); + responseEntity.writeTo(System.err); + throw new RuntimeException(); + } + System.out.println("FHIR resource history retrieved: "); + responseEntity.writeTo(System.out); + } + + private static CloudHealthcare createClient() throws IOException { + // Use Application Default Credentials (ADC) to authenticate the requests + // For more information see https://cloud.google.com/docs/authentication/production + GoogleCredential credential = + GoogleCredential.getApplicationDefault(HTTP_TRANSPORT, JSON_FACTORY) + .createScoped(Collections.singleton(CloudHealthcareScopes.CLOUD_PLATFORM)); + + // Create a HttpRequestInitializer, which will provide a baseline configuration to all requests. + HttpRequestInitializer requestInitializer = + request -> { + credential.initialize(request); + 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. + return new CloudHealthcare.Builder(HTTP_TRANSPORT, JSON_FACTORY, requestInitializer) + .setApplicationName("your-application-name") + .build(); + } + + private static String getAccessToken() throws IOException { + GoogleCredential credential = + GoogleCredential.getApplicationDefault(HTTP_TRANSPORT, JSON_FACTORY) + .createScoped(Collections.singleton(CloudHealthcareScopes.CLOUD_PLATFORM)); + credential.refreshToken(); + return credential.getAccessToken(); + } +} +// [END healthcare_list_resource_history] diff --git a/healthcare/v1beta1/src/test/java/snippets/healthcare/FhirResourceTests.java b/healthcare/v1beta1/src/test/java/snippets/healthcare/FhirResourceTests.java index 247b085e9c9..1fbf19eba94 100644 --- a/healthcare/v1beta1/src/test/java/snippets/healthcare/FhirResourceTests.java +++ b/healthcare/v1beta1/src/test/java/snippets/healthcare/FhirResourceTests.java @@ -19,6 +19,7 @@ import static junit.framework.TestCase.assertNotNull; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.ByteArrayOutputStream; @@ -49,6 +50,7 @@ import snippets.healthcare.fhir.resources.FhirResourceGetHistory; import snippets.healthcare.fhir.resources.FhirResourceGetMetadata; import snippets.healthcare.fhir.resources.FhirResourceGetPatientEverything; +import snippets.healthcare.fhir.resources.FhirResourceListHistory; import snippets.healthcare.fhir.resources.FhirResourcePatch; import snippets.healthcare.fhir.resources.FhirResourceSearch; import snippets.healthcare.fhir.resources.FhirResourceSearchPost; @@ -235,9 +237,25 @@ public void test_FhirResourceGetHistory() throws Exception { FhirResourcePatch.fhirResourcePatch( fhirResourceName, "[{\"op\": \"add\", \"path\": \"/active\", \"value\": false}]"); - FhirResourceGetHistory.fhirResourceGetHistory(fhirResourceName); + // Get versionId from results of fhirResourcePatch. + String versionId; + Matcher idMatcher = Pattern.compile("\"versionId\": \"(.*)\"").matcher(bout.toString()); + assertTrue(idMatcher.find()); + versionId = idMatcher.group(1); + FhirResourceGetHistory.fhirResourceGetHistory(fhirResourceName, versionId); String output = bout.toString(); + assertThat(output, containsString("FHIR resource history list retrieved:")); + } + + @Test + public void test_FhirResourceListHistory() throws Exception { + FhirResourcePatch.fhirResourcePatch( + fhirResourceName, + "[{\"op\": \"add\", \"path\": \"/active\", \"value\": false}]"); + FhirResourceListHistory.fhirResourceListHistory(fhirResourceName); + String output = bout.toString(); + assertThat(output, containsString("FHIR resource history retrieved:")); } From 2679e1c4a40f62d9ef07c66dd6f6f55616e67af8 Mon Sep 17 00:00:00 2001 From: Dane Zeke Liergaard Date: Mon, 6 Apr 2020 14:23:49 -0700 Subject: [PATCH 2/3] Resolve #2456. --- healthcare/v1beta1/pom.xml | 14 +++++++++++++- .../dicom/DicomWebSearchForInstances.java | 2 -- .../healthcare/dicom/DicomWebStoreInstance.java | 3 --- .../healthcare/fhir/FhirStoreExecuteBundle.java | 3 --- .../resources/FhirResourceConditionalDelete.java | 1 - .../resources/FhirResourceConditionalPatch.java | 3 --- .../resources/FhirResourceConditionalUpdate.java | 3 --- .../fhir/resources/FhirResourceCreate.java | 3 --- .../fhir/resources/FhirResourceDelete.java | 3 --- .../fhir/resources/FhirResourceDeletePurge.java | 3 --- .../healthcare/fhir/resources/FhirResourceGet.java | 3 --- .../fhir/resources/FhirResourceGetHistory.java | 3 --- .../fhir/resources/FhirResourceGetMetadata.java | 2 -- .../FhirResourceGetPatientEverything.java | 3 --- .../fhir/resources/FhirResourceListHistory.java | 7 +++---- .../fhir/resources/FhirResourcePatch.java | 3 --- .../fhir/resources/FhirResourceSearch.java | 3 --- .../fhir/resources/FhirResourceSearchPost.java | 3 --- .../hl7v2/messages/HL7v2MessageList.java | 14 +++++++++----- .../java/snippets/healthcare/DatasetTests.java | 5 ++--- .../java/snippets/healthcare/DicomStoreTests.java | 1 - .../snippets/healthcare/FhirResourceTests.java | 1 - .../java/snippets/healthcare/FhirStoreTests.java | 1 - .../snippets/healthcare/Hl7v2MessageTests.java | 3 ++- .../java/snippets/healthcare/Hl7v2StoreTests.java | 1 - 25 files changed, 29 insertions(+), 62 deletions(-) diff --git a/healthcare/v1beta1/pom.xml b/healthcare/v1beta1/pom.xml index 5766f7bd46a..c33fe5a0505 100644 --- a/healthcare/v1beta1/pom.xml +++ b/healthcare/v1beta1/pom.xml @@ -6,6 +6,18 @@ com.google.samples healthcare-samples 1.0-SNAPSHOT + + + + org.apache.maven.plugins + maven-compiler-plugin + + 10 + 10 + + + + jar