refactor HCLS IO ITs to support stores in other projects

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/healthcare/FhirIOReadIT.java

@@ -25,7 +25,6 @@
 import java.util.Collection;
 import org.apache.beam.runners.direct.DirectOptions;
 import org.apache.beam.sdk.PipelineResult;
-import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
 import org.apache.beam.sdk.io.gcp.pubsub.PubsubClient;
 import org.apache.beam.sdk.io.gcp.pubsub.PubsubClient.SubscriptionPath;
 import org.apache.beam.sdk.io.gcp.pubsub.PubsubClient.TopicPath;
@@ -72,7 +71,10 @@ public FhirIOReadIT(String version) {
     long testTime = System.currentTimeMillis();
     this.fhirStoreName =
         "FHIR_store_" + version + "_write_it_" + testTime + "_" + (new SecureRandom().nextInt(32));
-    this.project = TestPipeline.testingPipelineOptions().as(GcpOptions.class).getProject();
+    this.project =
+        TestPipeline.testingPipelineOptions()
+            .as(HealthcareStoreTestPipelineOptions.class)
+            .getStoreProjectId();
     this.pubsubTopic =
         "projects/"
             + project

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/healthcare/FhirIOTestOptions.java

@@ -22,9 +22,8 @@
 import org.apache.beam.sdk.options.Default;
 import org.apache.beam.sdk.options.Description;
 import org.apache.beam.sdk.options.Validation.Required;
-import org.apache.beam.sdk.testing.TestPipelineOptions;
 
-public interface FhirIOTestOptions extends TestPipelineOptions {
+public interface FhirIOTestOptions extends HealthcareStoreTestPipelineOptions {
 
   @Description(
       "FHIR store should match the pattern: projects/PROJECT_ID/locations/LOCATION/datasets/DATASET_ID/fhirStores/HL7V2_STORE_ID")

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/healthcare/FhirIOWriteIT.java

@@ -26,7 +26,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import org.apache.beam.sdk.Pipeline;
-import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
 import org.apache.beam.sdk.io.gcp.healthcare.FhirIO.Import.ContentStructure;
 import org.apache.beam.sdk.options.PipelineOptionsFactory;
 import org.apache.beam.sdk.testing.PAssert;
@@ -71,14 +70,22 @@ public void setup() throws Exception {
       client = new HttpHealthcareApiClient();
     }
     PipelineOptionsFactory.register(FhirIOTestOptions.class);
-    String project = TestPipeline.testingPipelineOptions().as(GcpOptions.class).getProject();
+    String project =
+        TestPipeline.testingPipelineOptions()
+            .as(HealthcareStoreTestPipelineOptions.class)
+            .getStoreProjectId();
     healthcareDataset = String.format(HEALTHCARE_DATASET_TEMPLATE, project);
     options = TestPipeline.testingPipelineOptions().as(FhirIOTestOptions.class);
-    options.setGcsTempPath(
-        String.format("gs://%s/FhirIOWrite%sIT/%s/temp/", DEFAULT_TEMP_BUCKET, version, testTime));
-    options.setGcsDeadLetterPath(
-        String.format(
-            "gs://%s/FhirIOWrite%sIT/%s/deadletter/", DEFAULT_TEMP_BUCKET, version, testTime));
+    if (options.getGcsTempPath() == null) {
+      options.setGcsTempPath(
+          String.format(
+              "gs://%s/FhirIOWrite%sIT/%s/temp/", DEFAULT_TEMP_BUCKET, version, testTime));
+    }
+    if (options.getGcsDeadLetterPath() == null) {
+      options.setGcsDeadLetterPath(
+          String.format(
+              "gs://%s/FhirIOWrite%sIT/%s/deadletter/", DEFAULT_TEMP_BUCKET, version, testTime));
+    }
     options.setFhirStore(healthcareDataset + "/fhirStores/" + fhirStoreName);
     HealthcareApiClient client = new HttpHealthcareApiClient();
     client.createFhirStore(healthcareDataset, fhirStoreName, version);
@@ -111,7 +118,9 @@ public void testFhirIO_ExecuteBundle() throws IOException {
   @Test
   public void testFhirIO_Import() {
     Pipeline pipeline = Pipeline.create(options);
-    options.setTempLocation("gs://temp-storage-for-healthcare-io-tests");
+    if (options.getTempLocation() == null) {
+      options.setTempLocation("gs://temp-storage-for-healthcare-io-tests");
+    }
     FhirIO.Write.Result result =
         pipeline
             .apply(Create.of(BUNDLES.get(version)))

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/healthcare/HL7v2IOReadIT.java

@@ -28,7 +28,6 @@
 import java.io.IOException;
 import java.security.SecureRandom;
 import org.apache.beam.sdk.Pipeline;
-import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
 import org.apache.beam.sdk.transforms.Count;
@@ -52,11 +51,15 @@ public class HL7v2IOReadIT {
           + "_"
           + (new SecureRandom().nextInt(32))
           + "_read_it";
+
   @Rule public transient TestPipeline pipeline = TestPipeline.create();
 
   @BeforeClass
   public static void createHL7v2tore() throws IOException {
-    String project = TestPipeline.testingPipelineOptions().as(GcpOptions.class).getProject();
+    String project =
+        TestPipeline.testingPipelineOptions()
+            .as(HealthcareStoreTestPipelineOptions.class)
+            .getStoreProjectId();
     healthcareDataset = String.format(HEALTHCARE_DATASET_TEMPLATE, project);
     HealthcareApiClient client = new HttpHealthcareApiClient();
     client.createHL7v2Store(healthcareDataset, HL7V2_STORE_NAME);

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/healthcare/HL7v2IOReadWriteIT.java

@@ -26,7 +26,6 @@
 import java.security.SecureRandom;
 import java.util.Collections;
 import java.util.concurrent.TimeoutException;
-import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
 import org.apache.beam.sdk.io.gcp.healthcare.HL7v2IOTestUtil.ListHL7v2MessageIDs;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
@@ -61,7 +60,10 @@ public class HL7v2IOReadWriteIT {
 
   @BeforeClass
   public static void createHL7v2tores() throws IOException {
-    String project = TestPipeline.testingPipelineOptions().as(GcpOptions.class).getProject();
+    String project =
+        TestPipeline.testingPipelineOptions()
+            .as(HealthcareStoreTestPipelineOptions.class)
+            .getStoreProjectId();
     healthcareDataset = String.format(HEALTHCARE_DATASET_TEMPLATE, project);
     HealthcareApiClient client = new HttpHealthcareApiClient();
     client.createHL7v2Store(healthcareDataset, INPUT_HL7V2_STORE_NAME);

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/healthcare/HL7v2IOWriteIT.java

@@ -26,7 +26,6 @@
 import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.concurrent.TimeoutException;
-import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.TestPipeline;
 import org.apache.beam.sdk.transforms.Create;
@@ -53,7 +52,10 @@ public class HL7v2IOWriteIT {
 
   @BeforeClass
   public static void createHL7v2tore() throws IOException {
-    String project = TestPipeline.testingPipelineOptions().as(GcpOptions.class).getProject();
+    String project =
+        TestPipeline.testingPipelineOptions()
+            .as(HealthcareStoreTestPipelineOptions.class)
+            .getStoreProjectId();
     healthcareDataset = String.format(HEALTHCARE_DATASET_TEMPLATE, project);
     HealthcareApiClient client = new HttpHealthcareApiClient();
     Hl7V2Store store = client.createHL7v2Store(healthcareDataset, HL7V2_STORE_NAME);

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/healthcare/HealthcareStoreTestPipelineOptions.java

@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.beam.sdk.io.gcp.healthcare;
+
+import org.apache.beam.sdk.options.Default;
+import org.apache.beam.sdk.options.Description;
+import org.apache.beam.sdk.testing.TestPipelineOptions;
+
+/** Pipeline options for HL7v2 pipelines. */
+public interface HealthcareStoreTestPipelineOptions extends TestPipelineOptions {
+  @Description("Project that hosts HL7v2 store")
+  @Default.String("apache-beam-testing")
+  String getStoreProjectId();
+
+  void setStoreProjectId(String value);
+}