[beam] branch master updated: Minor FhirIO Search changes

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 9e3a2f0  Minor FhirIO Search changes
     new 170d581  Merge pull request #14249 from Minor FhirIO Search changes
9e3a2f0 is described below

commit 9e3a2f0fc5abf2f182d436b0d0390de534059463
Author: Milena Bukal <ms...@google.com>
AuthorDate: Tue Mar 16 11:40:11 2021 -0400

    Minor FhirIO Search changes
    
    - Correct comment for how to form "OR" vs "AND" searches.
    - Add toString method to FhirSearchParameter, to make diffs easier to
    read.
---
 .../java/org/apache/beam/sdk/io/gcp/healthcare/FhirIO.java |  6 +++---
 .../beam/sdk/io/gcp/healthcare/FhirSearchParameter.java    | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/FhirIO.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/FhirIO.java
index 4f99435..2a6be01 100644
--- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/FhirIO.java
+++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/FhirIO.java
@@ -208,9 +208,9 @@ import org.slf4j.LoggerFactory;
  * DeidentifyConfig deidConfig = new DeidentifyConfig(); // use default DeidentifyConfig
  * pipeline.apply(FhirIO.deidentify(fhirStoreName, destinationFhirStoreName, deidConfig));
  *
- * // Search FHIR resources using a simple query.
+ * // Search FHIR resources using an "OR" query.
  * Map<String, String> queries = new HashMap<>();
- * queries.put("name", "Alice");
+ * queries.put("name", "Alice,Bob");
  * FhirSearchParameter<String> searchParameter = FhirSearchParameter.of("Patient", queries);
  * PCollection<FhirSearchParameter<String>> searchQueries =
  * pipeline.apply(
@@ -220,7 +220,7 @@ import org.slf4j.LoggerFactory;
  *      searchQueries.apply(FhirIO.searchResources(options.getFhirStore()));
  * PCollection<JsonArray> resources = searchResult.getResources(); // JsonArray of results
  *
- * // Search FHIR resources using an "OR" query.
+ * // Search FHIR resources using an "AND" query with a key.
  * Map<String, List<String>> listQueries = new HashMap<>();
  * listQueries.put("name", Arrays.asList("Alice", "Bob"));
  * FhirSearchParameter<List<String>> listSearchParameter =
diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/FhirSearchParameter.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/FhirSearchParameter.java
index 87d9192..6f80d86 100644
--- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/FhirSearchParameter.java
+++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/FhirSearchParameter.java
@@ -86,4 +86,18 @@ public class FhirSearchParameter<T> {
   public int hashCode() {
     return Objects.hash(resourceType, queries);
   }
+
+  @Override
+  public String toString() {
+    return "FhirSearchParameter{"
+        + "resourceType='"
+        + resourceType
+        + '\''
+        + ", key='"
+        + key
+        + '\''
+        + ", queries="
+        + queries
+        + '}';
+  }
 }