diff --git a/samples/snippets/src/main/java/com/example/bigquerydatatransfer/CreateScheduledQuery.java b/samples/snippets/src/main/java/com/example/bigquerydatatransfer/CreateScheduledQuery.java index b5875cc6..3610561d 100644 --- a/samples/snippets/src/main/java/com/example/bigquerydatatransfer/CreateScheduledQuery.java +++ b/samples/snippets/src/main/java/com/example/bigquerydatatransfer/CreateScheduledQuery.java @@ -31,7 +31,7 @@ // Sample to create a scheduled query public class CreateScheduledQuery { - public static void main(String[] args) { + public static void main(String[] args) throws IOException { // TODO(developer): Replace these variables before running the sample. final String projectId = "MY_PROJECT_ID"; final String datasetId = "MY_DATASET_ID"; @@ -56,7 +56,8 @@ public static void main(String[] args) { createScheduledQuery(projectId, transferConfig); } - public static void createScheduledQuery(String projectId, TransferConfig transferConfig) { + public static void createScheduledQuery(String projectId, TransferConfig transferConfig) + throws IOException { try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { ProjectName parent = ProjectName.of(projectId); CreateTransferConfigRequest request = @@ -65,9 +66,9 @@ public static void createScheduledQuery(String projectId, TransferConfig transfe .setTransferConfig(transferConfig) .build(); TransferConfig config = dataTransferServiceClient.createTransferConfig(request); - System.out.print("Scheduled query created successfully." + config.getName()); - } catch (IOException | ApiException ex) { - System.out.print("Scheduled query was not created." + ex.toString()); + System.out.println("\nScheduled query created successfully :" + config.getName()); + } catch (ApiException ex) { + System.out.print("\nScheduled query was not created." + ex.toString()); } } } diff --git a/samples/snippets/src/main/java/com/example/bigquerydatatransfer/DeleteScheduledQuery.java b/samples/snippets/src/main/java/com/example/bigquerydatatransfer/DeleteScheduledQuery.java index c98252a4..87ed71f0 100644 --- a/samples/snippets/src/main/java/com/example/bigquerydatatransfer/DeleteScheduledQuery.java +++ b/samples/snippets/src/main/java/com/example/bigquerydatatransfer/DeleteScheduledQuery.java @@ -25,7 +25,7 @@ // Sample to delete a scheduled query public class DeleteScheduledQuery { - public static void main(String[] args) { + public static void main(String[] args) throws IOException { // TODO(developer): Replace these variables before running the sample. // i.e projects/{project_id}/transferConfigs/{config_id}` or // `projects/{project_id}/locations/{location_id}/transferConfigs/{config_id}` @@ -33,13 +33,13 @@ public static void main(String[] args) { deleteScheduledQuery(name); } - public static void deleteScheduledQuery(String name) { + public static void deleteScheduledQuery(String name) throws IOException { try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { DeleteTransferConfigRequest request = DeleteTransferConfigRequest.newBuilder().setName(name).build(); dataTransferServiceClient.deleteTransferConfig(request); - System.out.print("Scheduled query deleted successfully."); - } catch (IOException | ApiException ex) { + System.out.print("Scheduled query deleted successfully.\n"); + } catch (ApiException ex) { System.out.print("Scheduled query was not deleted." + ex.toString()); } } diff --git a/samples/snippets/src/main/java/com/example/bigquerydatatransfer/GetTransferConfigInfo.java b/samples/snippets/src/main/java/com/example/bigquerydatatransfer/GetTransferConfigInfo.java index 14b57a6d..a01febe3 100644 --- a/samples/snippets/src/main/java/com/example/bigquerydatatransfer/GetTransferConfigInfo.java +++ b/samples/snippets/src/main/java/com/example/bigquerydatatransfer/GetTransferConfigInfo.java @@ -39,7 +39,7 @@ public static void getTransferConfigInfo(String configId) throws IOException { GetTransferConfigRequest request = GetTransferConfigRequest.newBuilder().setName(configId).build(); TransferConfig info = dataTransferServiceClient.getTransferConfig(request); - System.out.printf("\nConfig info retrieved successfully.name : %s \n", info.getName()); + System.out.print("Config info retrieved successfully." + info.getName() + "\n"); } catch (ApiException ex) { System.out.print("config not found." + ex.toString()); } diff --git a/samples/snippets/src/main/java/com/example/bigquerydatatransfer/ListTransferConfigs.java b/samples/snippets/src/main/java/com/example/bigquerydatatransfer/ListTransferConfigs.java new file mode 100644 index 00000000..875152b7 --- /dev/null +++ b/samples/snippets/src/main/java/com/example/bigquerydatatransfer/ListTransferConfigs.java @@ -0,0 +1,49 @@ +/* + * 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 com.example.bigquerydatatransfer; + +// [START bigquerydatatransfer_list_configs] +import com.google.api.gax.rpc.ApiException; +import com.google.cloud.bigquery.datatransfer.v1.DataTransferServiceClient; +import com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest; +import com.google.cloud.bigquery.datatransfer.v1.ProjectName; +import java.io.IOException; + +// Sample to get list of transfer config +public class ListTransferConfigs { + + public static void main(String[] args) throws IOException { + // TODO(developer): Replace these variables before running the sample. + final String projectId = "MY_PROJECT_ID"; + listTransferConfigs(projectId); + } + + public static void listTransferConfigs(String projectId) throws IOException { + try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { + ProjectName parent = ProjectName.of(projectId); + ListTransferConfigsRequest request = + ListTransferConfigsRequest.newBuilder().setParent(parent.toString()).build(); + dataTransferServiceClient + .listTransferConfigs(request) + .iterateAll() + .forEach(config -> System.out.print("Success! Config ID :" + config.getName() + "\n")); + } catch (ApiException ex) { + System.out.println("Config list not found due to error." + ex.toString()); + } + } +} +// [END bigquerydatatransfer_list_configs] diff --git a/samples/snippets/src/test/java/com/example/bigquerydatatransfer/CreateScheduledQueryIT.java b/samples/snippets/src/test/java/com/example/bigquerydatatransfer/CreateScheduledQueryIT.java index 3f585c37..7ca4fff8 100644 --- a/samples/snippets/src/test/java/com/example/bigquerydatatransfer/CreateScheduledQueryIT.java +++ b/samples/snippets/src/test/java/com/example/bigquerydatatransfer/CreateScheduledQueryIT.java @@ -27,10 +27,13 @@ import com.google.protobuf.Struct; import com.google.protobuf.Value; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.PrintStream; import java.util.HashMap; import java.util.Map; import java.util.UUID; +import java.util.logging.Level; +import java.util.logging.Logger; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -38,12 +41,14 @@ public class CreateScheduledQueryIT { + private static final Logger LOG = Logger.getLogger(CreateScheduledQueryIT.class.getName()); private BigQuery bigquery; private ByteArrayOutputStream bout; private String name; private String displayName; private String datasetName; private PrintStream out; + private PrintStream originalPrintStream; private static final String PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT"); @@ -67,22 +72,27 @@ public void setUp() { // create a temporary dataset bigquery = BigQueryOptions.getDefaultInstance().getService(); bigquery.create(DatasetInfo.of(datasetName)); + bout = new ByteArrayOutputStream(); out = new PrintStream(bout); + originalPrintStream = System.out; System.setOut(out); } @After - public void tearDown() { + public void tearDown() throws IOException { // Clean up DeleteScheduledQuery.deleteScheduledQuery(name); // delete a temporary dataset bigquery.delete(datasetName, BigQuery.DatasetDeleteOption.deleteContents()); - System.setOut(null); + // restores print statements in the original method + System.out.flush(); + System.setOut(originalPrintStream); + LOG.log(Level.INFO, bout.toString()); } @Test - public void testCreateScheduledQuery() { + public void testCreateScheduledQuery() throws IOException { String query = "SELECT CURRENT_TIMESTAMP() as current_time, @run_time as intended_run_time, " + "@run_date as intended_run_date, 17 as some_integer"; @@ -106,7 +116,7 @@ public void testCreateScheduledQuery() { .build(); CreateScheduledQuery.createScheduledQuery(PROJECT_ID, transferConfig); String result = bout.toString(); - name = result.substring(result.indexOf(".") + 1); - assertThat(result).contains("Scheduled query created successfully."); + name = result.substring(result.indexOf(":") + 1, result.length() - 1); + assertThat(result).contains("Scheduled query created successfully"); } } diff --git a/samples/snippets/src/test/java/com/example/bigquerydatatransfer/DeleteScheduledQueryIT.java b/samples/snippets/src/test/java/com/example/bigquerydatatransfer/DeleteScheduledQueryIT.java index b36082fc..e2f0ec76 100644 --- a/samples/snippets/src/test/java/com/example/bigquerydatatransfer/DeleteScheduledQueryIT.java +++ b/samples/snippets/src/test/java/com/example/bigquerydatatransfer/DeleteScheduledQueryIT.java @@ -22,14 +22,20 @@ import com.google.cloud.bigquery.BigQuery; import com.google.cloud.bigquery.BigQueryOptions; import com.google.cloud.bigquery.DatasetInfo; +import com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest; +import com.google.cloud.bigquery.datatransfer.v1.DataTransferServiceClient; +import com.google.cloud.bigquery.datatransfer.v1.ProjectName; import com.google.cloud.bigquery.datatransfer.v1.TransferConfig; import com.google.protobuf.Struct; import com.google.protobuf.Value; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.PrintStream; import java.util.HashMap; import java.util.Map; import java.util.UUID; +import java.util.logging.Level; +import java.util.logging.Logger; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -37,12 +43,14 @@ public class DeleteScheduledQueryIT { + private static final Logger LOG = Logger.getLogger(DeleteScheduledQueryIT.class.getName()); private BigQuery bigquery; private ByteArrayOutputStream bout; private String name; private String displayName; private String datasetName; private PrintStream out; + private PrintStream originalPrintStream; private static final String PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT"); @@ -60,9 +68,10 @@ public static void checkRequirements() { } @Before - public void setUp() { + public void setUp() throws IOException { bout = new ByteArrayOutputStream(); out = new PrintStream(bout); + originalPrintStream = System.out; System.setOut(out); displayName = "MY_SCHEDULE_NAME_TEST_" + UUID.randomUUID().toString().substring(0, 8); @@ -92,24 +101,30 @@ public void setUp() { .setParams(Struct.newBuilder().putAllFields(params).build()) .setSchedule("every 24 hours") .build(); - CreateScheduledQuery.createScheduledQuery(PROJECT_ID, transferConfig); - String result = bout.toString(); - name = result.substring(result.indexOf(".") + 1); - - bout = new ByteArrayOutputStream(); - out = new PrintStream(bout); - System.setOut(out); + try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { + ProjectName parent = ProjectName.of(PROJECT_ID); + CreateTransferConfigRequest request = + CreateTransferConfigRequest.newBuilder() + .setParent(parent.toString()) + .setTransferConfig(transferConfig) + .build(); + name = dataTransferServiceClient.createTransferConfig(request).getName(); + System.out.println("\nScheduled query created successfully :" + name); + } } @After public void tearDown() { // delete a temporary dataset bigquery.delete(datasetName, BigQuery.DatasetDeleteOption.deleteContents()); - System.setOut(null); + // restores print statements in the original method + System.out.flush(); + System.setOut(originalPrintStream); + LOG.log(Level.INFO, bout.toString()); } @Test - public void testDeleteScheduledQuery() { + public void testDeleteScheduledQuery() throws IOException { // delete scheduled query that was just created DeleteScheduledQuery.deleteScheduledQuery(name); assertThat(bout.toString()).contains("Scheduled query deleted successfully."); diff --git a/samples/snippets/src/test/java/com/example/bigquerydatatransfer/GetTransferConfigInfoIT.java b/samples/snippets/src/test/java/com/example/bigquerydatatransfer/GetTransferConfigInfoIT.java index 818c4a3d..0d3de100 100644 --- a/samples/snippets/src/test/java/com/example/bigquerydatatransfer/GetTransferConfigInfoIT.java +++ b/samples/snippets/src/test/java/com/example/bigquerydatatransfer/GetTransferConfigInfoIT.java @@ -22,6 +22,9 @@ import com.google.cloud.bigquery.BigQuery; import com.google.cloud.bigquery.BigQueryOptions; import com.google.cloud.bigquery.DatasetInfo; +import com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest; +import com.google.cloud.bigquery.datatransfer.v1.DataTransferServiceClient; +import com.google.cloud.bigquery.datatransfer.v1.ProjectName; import com.google.cloud.bigquery.datatransfer.v1.TransferConfig; import com.google.protobuf.Struct; import com.google.protobuf.Value; @@ -31,6 +34,8 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; +import java.util.logging.Level; +import java.util.logging.Logger; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -38,6 +43,7 @@ public class GetTransferConfigInfoIT { + private static final Logger LOG = Logger.getLogger(GetTransferConfigInfoIT.class.getName()); private BigQuery bigquery; private ByteArrayOutputStream bout; private String name; @@ -62,7 +68,7 @@ public static void checkRequirements() { } @Before - public void setUp() { + public void setUp() throws IOException { bout = new ByteArrayOutputStream(); out = new PrintStream(bout); originalPrintStream = System.out; @@ -70,11 +76,9 @@ public void setUp() { displayName = "MY_SCHEDULE_NAME_TEST_" + UUID.randomUUID().toString().substring(0, 8); datasetName = "MY_DATASET_NAME_TEST_" + UUID.randomUUID().toString().substring(0, 8); - // create a temporary dataset bigquery = BigQueryOptions.getDefaultInstance().getService(); bigquery.create(DatasetInfo.of(datasetName)); - // create a scheduled query String query = "SELECT CURRENT_TIMESTAMP() as current_time, @run_time as intended_run_time, " @@ -96,22 +100,29 @@ public void setUp() { .setParams(Struct.newBuilder().putAllFields(params).build()) .setSchedule("every 24 hours") .build(); - CreateScheduledQuery.createScheduledQuery(PROJECT_ID, transferConfig); - String result = bout.toString(); - name = result.substring(result.indexOf(".") + 1); + try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { + ProjectName parent = ProjectName.of(PROJECT_ID); + CreateTransferConfigRequest request = + CreateTransferConfigRequest.newBuilder() + .setParent(parent.toString()) + .setTransferConfig(transferConfig) + .build(); + name = dataTransferServiceClient.createTransferConfig(request).getName(); + System.out.println("\nScheduled query created successfully :" + name); + } } @After - public void tearDown() { + public void tearDown() throws IOException { // delete scheduled query that was just created DeleteScheduledQuery.deleteScheduledQuery(name); // delete a temporary dataset bigquery.delete(datasetName, BigQuery.DatasetDeleteOption.deleteContents()); // restores print statements in the original method + System.out.flush(); System.setOut(originalPrintStream); - String output = new String(bout.toByteArray()); - System.out.println(output); + LOG.log(Level.INFO, bout.toString()); } @Test diff --git a/samples/snippets/src/test/java/com/example/bigquerydatatransfer/ListTransferConfigsIT.java b/samples/snippets/src/test/java/com/example/bigquerydatatransfer/ListTransferConfigsIT.java new file mode 100644 index 00000000..ac0c5a49 --- /dev/null +++ b/samples/snippets/src/test/java/com/example/bigquerydatatransfer/ListTransferConfigsIT.java @@ -0,0 +1,134 @@ +/* + * 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 com.example.bigquerydatatransfer; + +import static com.google.common.truth.Truth.assertThat; +import static junit.framework.TestCase.assertNotNull; + +import com.google.cloud.bigquery.BigQuery; +import com.google.cloud.bigquery.BigQueryOptions; +import com.google.cloud.bigquery.DatasetInfo; +import com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest; +import com.google.cloud.bigquery.datatransfer.v1.DataTransferServiceClient; +import com.google.cloud.bigquery.datatransfer.v1.ProjectName; +import com.google.cloud.bigquery.datatransfer.v1.TransferConfig; +import com.google.protobuf.Struct; +import com.google.protobuf.Value; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +public class ListTransferConfigsIT { + + private static final Logger LOG = Logger.getLogger(ListTransferConfigsIT.class.getName()); + private BigQuery bigquery; + private ByteArrayOutputStream bout; + private String name; + private String displayName; + private String datasetName; + private PrintStream out; + private PrintStream originalPrintStream; + + private static final String PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT"); + + private static String requireEnvVar(String varName) { + String value = System.getenv(varName); + assertNotNull( + "Environment variable " + varName + " is required to perform these tests.", + System.getenv(varName)); + return value; + } + + @BeforeClass + public static void checkRequirements() { + requireEnvVar("GOOGLE_CLOUD_PROJECT"); + } + + @Before + public void setUp() throws IOException { + bout = new ByteArrayOutputStream(); + out = new PrintStream(bout); + originalPrintStream = System.out; + System.setOut(out); + + displayName = "MY_SCHEDULE_NAME_TEST_" + UUID.randomUUID().toString().substring(0, 8); + datasetName = "MY_DATASET_NAME_TEST_" + UUID.randomUUID().toString().substring(0, 8); + // create a temporary dataset + bigquery = BigQueryOptions.getDefaultInstance().getService(); + bigquery.create(DatasetInfo.of(datasetName)); + + // create a scheduled query + String query = + "SELECT CURRENT_TIMESTAMP() as current_time, @run_time as intended_run_time, " + + "@run_date as intended_run_date, 17 as some_integer"; + String destinationTableName = + "MY_DESTINATION_TABLE_" + UUID.randomUUID().toString().substring(0, 8) + "_{run_date}"; + Map params = new HashMap<>(); + params.put("query", Value.newBuilder().setStringValue(query).build()); + params.put( + "destination_table_name_template", + Value.newBuilder().setStringValue(destinationTableName).build()); + params.put("write_disposition", Value.newBuilder().setStringValue("WRITE_TRUNCATE").build()); + params.put("partitioning_field", Value.newBuilder().setStringValue("").build()); + TransferConfig transferConfig = + TransferConfig.newBuilder() + .setDestinationDatasetId(datasetName) + .setDisplayName(displayName) + .setDataSourceId("scheduled_query") + .setParams(Struct.newBuilder().putAllFields(params).build()) + .setSchedule("every 24 hours") + .build(); + try (DataTransferServiceClient dataTransferServiceClient = DataTransferServiceClient.create()) { + ProjectName parent = ProjectName.of(PROJECT_ID); + CreateTransferConfigRequest request = + CreateTransferConfigRequest.newBuilder() + .setParent(parent.toString()) + .setTransferConfig(transferConfig) + .build(); + name = dataTransferServiceClient.createTransferConfig(request).getName(); + System.out.println("\nScheduled query created successfully :" + name); + } + } + + @After + public void tearDown() throws IOException { + // delete scheduled query that was just created + DeleteScheduledQuery.deleteScheduledQuery(name); + // delete a temporary dataset + bigquery.delete(datasetName, BigQuery.DatasetDeleteOption.deleteContents()); + + // restores print statements in the original method + System.out.flush(); + System.setOut(originalPrintStream); + LOG.log(Level.INFO, bout.toString()); + } + + @Test + public void testListTransferConfigs() throws IOException { + ListTransferConfigs.listTransferConfigs(PROJECT_ID); + assertThat(bout.toString()).contains("Success! Config ID "); + } +} diff --git a/samples/snippets/src/test/java/com/example/bigquerydatatransfer/QuickstartSampleIT.java b/samples/snippets/src/test/java/com/example/bigquerydatatransfer/QuickstartSampleIT.java index bc0c457c..b204fdfd 100644 --- a/samples/snippets/src/test/java/com/example/bigquerydatatransfer/QuickstartSampleIT.java +++ b/samples/snippets/src/test/java/com/example/bigquerydatatransfer/QuickstartSampleIT.java @@ -20,6 +20,8 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; +import java.util.logging.Level; +import java.util.logging.Logger; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -30,21 +32,28 @@ @RunWith(JUnit4.class) @SuppressWarnings("checkstyle:abbreviationaswordinname") public class QuickstartSampleIT { + + private static final Logger LOG = Logger.getLogger(QuickstartSampleIT.class.getName()); private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT"); private ByteArrayOutputStream bout; private PrintStream out; + private PrintStream originalPrintStream; @Before public void setUp() { bout = new ByteArrayOutputStream(); out = new PrintStream(bout); + originalPrintStream = System.out; System.setOut(out); } @After public void tearDown() { - System.setOut(null); + // restores print statements in the original method + System.out.flush(); + System.setOut(originalPrintStream); + LOG.log(Level.INFO, bout.toString()); } @Test