From fe5abc054c5eb7907ef58d5aa3285b3f10211aa4 Mon Sep 17 00:00:00 2001 From: Praful Makani Date: Wed, 19 Aug 2020 23:02:05 +0530 Subject: [PATCH] docs(samples): fix checkstyle errors (#682) Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [X] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/java-bigquery/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [X] Ensure the tests and linter pass - [X] Code coverage does not decrease (if any source code was changed) - [X] Appropriate docs were updated (if necessary) Fixes #681 --- .../bigquery/AuthorizedViewTutorial.java | 12 +-- ...{CopyTableCMEK.java => CopyTableCmek.java} | 6 +- .../com/example/bigquery/CreateModel.java | 2 +- ...eRoutineDDL.java => CreateRoutineDdl.java} | 9 +- ...ateTableCMEK.java => CreateTableCmek.java} | 6 +- ...{DDLCreateView.java => DdlCreateView.java} | 2 +- .../com/example/bigquery/GrantViewAccess.java | 8 +- .../example/bigquery/InsertingDataTypes.java | 74 ++++++++-------- ...dAvroFromGCS.java => LoadAvroFromGcs.java} | 6 +- ...cate.java => LoadAvroFromGcsTruncate.java} | 6 +- ...ect.java => LoadCsvFromGcsAutodetect.java} | 6 +- ...dJsonFromGCS.java => LoadJsonFromGcs.java} | 6 +- ...ct.java => LoadJsonFromGcsAutodetect.java} | 6 +- ...mGCSCMEK.java => LoadJsonFromGcsCmek.java} | 6 +- ...cate.java => LoadJsonFromGcsTruncate.java} | 6 +- ...oadOrcFromGCS.java => LoadOrcFromGcs.java} | 6 +- ...EK.java => QueryDestinationTableCmek.java} | 6 +- ...GCSPerm.java => QueryExternalGcsPerm.java} | 6 +- ...GCSTemp.java => QueryExternalGcsTemp.java} | 6 +- .../TableInsertRowsWithoutRowIds.java | 40 ++++----- ...ateTableCMEK.java => UpdateTableCmek.java} | 6 +- ...pdateTableDML.java => UpdateTableDml.java} | 6 +- ...yTableCMEKIT.java => CopyTableCmekIT.java} | 8 +- .../com/example/bigquery/CreateModelIT.java | 2 +- .../example/bigquery/CreateRoutineDDLIT.java | 67 --------------- .../example/bigquery/CreateRoutineDdlIT.java | 84 +++++++++++++++++++ ...ableCMEKIT.java => CreateTableCmekIT.java} | 6 +- ...CreateViewIT.java => DdlCreateViewIT.java} | 6 +- .../com/example/bigquery/DeleteModelIT.java | 2 +- .../java/com/example/bigquery/GetModelIT.java | 2 +- .../example/bigquery/GetTableLabelsIT.java | 16 ++++ .../bigquery/InsertingDataTypesIT.java | 40 +-------- .../com/example/bigquery/ListModelsIT.java | 2 +- .../example/bigquery/LoadAvroFromGCSIT.java | 64 -------------- .../example/bigquery/LoadAvroFromGcsIT.java | 80 ++++++++++++++++++ ...IT.java => LoadAvroFromGcsTruncateIT.java} | 6 +- ...T.java => LoadCsvFromGcsAutodetectIT.java} | 6 +- ....java => LoadJsonFromGcsAutodetectIT.java} | 6 +- ...CMEKIT.java => LoadJsonFromGcsCmekIT.java} | 6 +- ...nFromGCSIT.java => LoadJsonFromGcsIT.java} | 6 +- ...IT.java => LoadJsonFromGcsTruncateIT.java} | 6 +- ...rcFromGCSIT.java => LoadOrcFromGcsIT.java} | 6 +- ....java => QueryDestinationTableCmekIT.java} | 8 +- ...ermIT.java => QueryExternalGcsPermIT.java} | 6 +- ...empIT.java => QueryExternalGcsTempIT.java} | 6 +- .../TableInsertRowsWithoutRowIdsIT.java | 18 +--- .../bigquery/UpdateModelDescriptionIT.java | 2 +- ...ableCMEKIT.java => UpdateTableCmekIT.java} | 8 +- ...eTableDMLIT.java => UpdateTableDmlIT.java} | 6 +- 49 files changed, 347 insertions(+), 365 deletions(-) rename samples/snippets/src/main/java/com/example/bigquery/{CopyTableCMEK.java => CopyTableCmek.java} (97%) rename samples/snippets/src/main/java/com/example/bigquery/{CreateRoutineDDL.java => CreateRoutineDdl.java} (89%) rename samples/snippets/src/main/java/com/example/bigquery/{CreateTableCMEK.java => CreateTableCmek.java} (95%) rename samples/snippets/src/main/java/com/example/bigquery/{DDLCreateView.java => DdlCreateView.java} (98%) rename samples/snippets/src/main/java/com/example/bigquery/{LoadAvroFromGCS.java => LoadAvroFromGcs.java} (94%) rename samples/snippets/src/main/java/com/example/bigquery/{LoadAvroFromGCSTruncate.java => LoadAvroFromGcsTruncate.java} (95%) rename samples/snippets/src/main/java/com/example/bigquery/{LoadCsvFromGCSAutodetect.java => LoadCsvFromGcsAutodetect.java} (95%) rename samples/snippets/src/main/java/com/example/bigquery/{LoadJsonFromGCS.java => LoadJsonFromGcs.java} (95%) rename samples/snippets/src/main/java/com/example/bigquery/{LoadJsonFromGCSAutodetect.java => LoadJsonFromGcsAutodetect.java} (94%) rename samples/snippets/src/main/java/com/example/bigquery/{LoadJsonFromGCSCMEK.java => LoadJsonFromGcsCmek.java} (95%) rename samples/snippets/src/main/java/com/example/bigquery/{LoadJsonFromGCSTruncate.java => LoadJsonFromGcsTruncate.java} (95%) rename samples/snippets/src/main/java/com/example/bigquery/{LoadOrcFromGCS.java => LoadOrcFromGcs.java} (95%) rename samples/snippets/src/main/java/com/example/bigquery/{QueryDestinationTableCMEK.java => QueryDestinationTableCmek.java} (94%) rename samples/snippets/src/main/java/com/example/bigquery/{QueryExternalGCSPerm.java => QueryExternalGcsPerm.java} (95%) rename samples/snippets/src/main/java/com/example/bigquery/{QueryExternalGCSTemp.java => QueryExternalGcsTemp.java} (95%) rename samples/snippets/src/main/java/com/example/bigquery/{UpdateTableCMEK.java => UpdateTableCmek.java} (94%) rename samples/snippets/src/main/java/com/example/bigquery/{UpdateTableDML.java => UpdateTableDml.java} (97%) rename samples/snippets/src/test/java/com/example/bigquery/{CopyTableCMEKIT.java => CopyTableCmekIT.java} (95%) delete mode 100644 samples/snippets/src/test/java/com/example/bigquery/CreateRoutineDDLIT.java create mode 100644 samples/snippets/src/test/java/com/example/bigquery/CreateRoutineDdlIT.java rename samples/snippets/src/test/java/com/example/bigquery/{CreateTableCMEKIT.java => CreateTableCmekIT.java} (95%) rename samples/snippets/src/test/java/com/example/bigquery/{DDLCreateViewIT.java => DdlCreateViewIT.java} (96%) delete mode 100644 samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGCSIT.java create mode 100644 samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGcsIT.java rename samples/snippets/src/test/java/com/example/bigquery/{LoadAvroFromGCSTruncateIT.java => LoadAvroFromGcsTruncateIT.java} (93%) rename samples/snippets/src/test/java/com/example/bigquery/{LoadCsvFromGCSAutodetectIT.java => LoadCsvFromGcsAutodetectIT.java} (93%) rename samples/snippets/src/test/java/com/example/bigquery/{LoadJsonFromGCSAutodetectIT.java => LoadJsonFromGcsAutodetectIT.java} (94%) rename samples/snippets/src/test/java/com/example/bigquery/{LoadJsonFromGCSCMEKIT.java => LoadJsonFromGcsCmekIT.java} (95%) rename samples/snippets/src/test/java/com/example/bigquery/{LoadJsonFromGCSIT.java => LoadJsonFromGcsIT.java} (95%) rename samples/snippets/src/test/java/com/example/bigquery/{LoadJsonFromGCSTruncateIT.java => LoadJsonFromGcsTruncateIT.java} (94%) rename samples/snippets/src/test/java/com/example/bigquery/{LoadOrcFromGCSIT.java => LoadOrcFromGcsIT.java} (94%) rename samples/snippets/src/test/java/com/example/bigquery/{QueryDestinationTableCMEKIT.java => QueryDestinationTableCmekIT.java} (93%) rename samples/snippets/src/test/java/com/example/bigquery/{QueryExternalGCSPermIT.java => QueryExternalGcsPermIT.java} (95%) rename samples/snippets/src/test/java/com/example/bigquery/{QueryExternalGCSTempIT.java => QueryExternalGcsTempIT.java} (92%) rename samples/snippets/src/test/java/com/example/bigquery/{UpdateTableCMEKIT.java => UpdateTableCmekIT.java} (93%) rename samples/snippets/src/test/java/com/example/bigquery/{UpdateTableDMLIT.java => UpdateTableDmlIT.java} (94%) diff --git a/samples/snippets/src/main/java/com/example/bigquery/AuthorizedViewTutorial.java b/samples/snippets/src/main/java/com/example/bigquery/AuthorizedViewTutorial.java index d42909aa7..0b5150a58 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/AuthorizedViewTutorial.java +++ b/samples/snippets/src/main/java/com/example/bigquery/AuthorizedViewTutorial.java @@ -57,9 +57,8 @@ public static void authorizedViewTutorial( // [START bigquery_authorized_view_tutorial] // [START bigquery_avt_create_source_dataset] // Create a source dataset to store your table. - Dataset sourceDataset = bigquery.create(DatasetInfo.of(sourceDatasetId)); + final Dataset sourceDataset = bigquery.create(DatasetInfo.of(sourceDatasetId)); // [END bigquery_avt_create_source_dataset] - // [START bigquery_avt_create_source_table] // Populate a source table String tableQuery = @@ -72,32 +71,27 @@ public static void authorizedViewTutorial( .build(); bigquery.query(queryConfig); // [END bigquery_avt_create_source_table] - // [START bigquery_avt_create_shared_dataset] // Create a separate dataset to store your view Dataset sharedDataset = bigquery.create(DatasetInfo.of(sharedDatasetId)); // [END bigquery_avt_create_shared_dataset] - // [START bigquery_avt_create_view] // Create the view in the new dataset String viewQuery = String.format( - "SELECT commit, author.name as author, committer.name as committer, repo_name FROM %s.%s.%s", + "SELECT commit, author.name as author, " + + "committer.name as committer, repo_name FROM %s.%s.%s", projectId, sourceDatasetId, sourceTableId); - ViewDefinition viewDefinition = ViewDefinition.of(viewQuery); - Table view = bigquery.create(TableInfo.of(TableId.of(sharedDatasetId, sharedViewId), viewDefinition)); // [END bigquery_avt_create_view] - // [START bigquery_avt_shared_dataset_access] // Assign access controls to the dataset containing the view List viewAcl = new ArrayList<>(sharedDataset.getAcl()); viewAcl.add(Acl.of(new Acl.Group("example-analyst-group@google.com"), Acl.Role.READER)); sharedDataset.toBuilder().setAcl(viewAcl).build().update(); // [END bigquery_avt_shared_dataset_access] - // [START bigquery_avt_source_dataset_access] // Authorize the view to access the source dataset List srcAcl = new ArrayList<>(sourceDataset.getAcl()); diff --git a/samples/snippets/src/main/java/com/example/bigquery/CopyTableCMEK.java b/samples/snippets/src/main/java/com/example/bigquery/CopyTableCmek.java similarity index 97% rename from samples/snippets/src/main/java/com/example/bigquery/CopyTableCMEK.java rename to samples/snippets/src/main/java/com/example/bigquery/CopyTableCmek.java index 37321b2bb..ac4966b2f 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/CopyTableCMEK.java +++ b/samples/snippets/src/main/java/com/example/bigquery/CopyTableCmek.java @@ -27,7 +27,7 @@ import com.google.cloud.bigquery.TableId; // Sample to copy a cmek table -public class CopyTableCMEK { +public class CopyTableCmek { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. @@ -38,11 +38,11 @@ public static void main(String[] args) { String kmsKeyName = "MY_KMS_KEY_NAME"; EncryptionConfiguration encryption = EncryptionConfiguration.newBuilder().setKmsKeyName(kmsKeyName).build(); - copyTableCMEK( + copyTableCmek( sourceDatasetName, sourceTableId, destinationDatasetName, destinationTableId, encryption); } - public static void copyTableCMEK( + public static void copyTableCmek( String sourceDatasetName, String sourceTableId, String destinationDatasetName, diff --git a/samples/snippets/src/main/java/com/example/bigquery/CreateModel.java b/samples/snippets/src/main/java/com/example/bigquery/CreateModel.java index 72adbbb82..6b45718ce 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/CreateModel.java +++ b/samples/snippets/src/main/java/com/example/bigquery/CreateModel.java @@ -43,7 +43,7 @@ public static void main(String[] args) { + "learn_rate=0.4, " + "learn_rate_strategy='constant' " + ") AS ( " - + " SELECT 'a' AS f1, 2.0 AS label " + + "SELECT 'a' AS f1, 2.0 AS label " + "UNION ALL " + "SELECT 'b' AS f1, 3.8 AS label " + ")"; diff --git a/samples/snippets/src/main/java/com/example/bigquery/CreateRoutineDDL.java b/samples/snippets/src/main/java/com/example/bigquery/CreateRoutineDdl.java similarity index 89% rename from samples/snippets/src/main/java/com/example/bigquery/CreateRoutineDDL.java rename to samples/snippets/src/main/java/com/example/bigquery/CreateRoutineDdl.java index b787c7337..76122ea9e 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/CreateRoutineDDL.java +++ b/samples/snippets/src/main/java/com/example/bigquery/CreateRoutineDdl.java @@ -25,7 +25,7 @@ import com.google.cloud.bigquery.QueryJobConfiguration; // Sample to create a routine using DDL -public class CreateRoutineDDL { +public class CreateRoutineDdl { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. @@ -41,11 +41,12 @@ public static void main(String[] args) { + "." + routineId + "`" - + "( arr ARRAY>) AS ( (SELECT SUM(IF(elem.name = \"foo\",elem.val,null)) FROM UNNEST(arr) AS elem))"; - createRoutineDDL(sql); + + "( arr ARRAY>) AS " + + "( (SELECT SUM(IF(elem.name = \"foo\",elem.val,null)) FROM UNNEST(arr) AS elem))"; + createRoutineDdl(sql); } - public static void createRoutineDDL(String sql) { + public static void createRoutineDdl(String sql) { try { // Initialize client that will be used to send requests. This client only needs to be created // once, and can be reused for multiple requests. diff --git a/samples/snippets/src/main/java/com/example/bigquery/CreateTableCMEK.java b/samples/snippets/src/main/java/com/example/bigquery/CreateTableCmek.java similarity index 95% rename from samples/snippets/src/main/java/com/example/bigquery/CreateTableCMEK.java rename to samples/snippets/src/main/java/com/example/bigquery/CreateTableCmek.java index 4d24de6d2..bc654c387 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/CreateTableCMEK.java +++ b/samples/snippets/src/main/java/com/example/bigquery/CreateTableCmek.java @@ -30,7 +30,7 @@ import com.google.cloud.bigquery.TableInfo; // Sample to create a cmek table -public class CreateTableCMEK { +public class CreateTableCmek { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. @@ -44,10 +44,10 @@ public static void main(String[] args) { // i.e. projects/{project}/locations/{location}/keyRings/{key_ring}/cryptoKeys/{cryptoKey} EncryptionConfiguration encryption = EncryptionConfiguration.newBuilder().setKmsKeyName(kmsKeyName).build(); - createTableCMEK(datasetName, tableName, schema, encryption); + createTableCmek(datasetName, tableName, schema, encryption); } - public static void createTableCMEK( + public static void createTableCmek( String datasetName, String tableName, Schema schema, EncryptionConfiguration configuration) { try { // Initialize client that will be used to send requests. This client only needs to be created diff --git a/samples/snippets/src/main/java/com/example/bigquery/DDLCreateView.java b/samples/snippets/src/main/java/com/example/bigquery/DdlCreateView.java similarity index 98% rename from samples/snippets/src/main/java/com/example/bigquery/DDLCreateView.java rename to samples/snippets/src/main/java/com/example/bigquery/DdlCreateView.java index b21411470..116c44288 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/DDLCreateView.java +++ b/samples/snippets/src/main/java/com/example/bigquery/DdlCreateView.java @@ -25,7 +25,7 @@ import com.google.cloud.bigquery.QueryJobConfiguration; // Sample to create a view using DDL -public class DDLCreateView { +public class DdlCreateView { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. diff --git a/samples/snippets/src/main/java/com/example/bigquery/GrantViewAccess.java b/samples/snippets/src/main/java/com/example/bigquery/GrantViewAccess.java index a87f51eeb..4a989f024 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/GrantViewAccess.java +++ b/samples/snippets/src/main/java/com/example/bigquery/GrantViewAccess.java @@ -47,21 +47,17 @@ public static void grantViewAccess(String srcDatasetId, String viewDatasetId, St Dataset srcDataset = bigquery.getDataset(DatasetId.of(srcDatasetId)); Dataset viewDataset = bigquery.getDataset(DatasetId.of(viewDatasetId)); Table view = viewDataset.get(viewId); - // First, we'll add a group to the ACL for the dataset containing the view. This will allow // users within that group to query the view, but they must have direct access to any tables // referenced by the view. - List viewAcl = new ArrayList<>(); - viewAcl.addAll(viewDataset.getAcl()); + List viewAcl = new ArrayList<>(viewDataset.getAcl()); viewAcl.add(Acl.of(new Acl.Group("example-analyst-group@google.com"), Acl.Role.READER)); viewDataset.toBuilder().setAcl(viewAcl).build().update(); - // Now, we'll authorize a specific view against a source dataset, delegating access // enforcement. Once this has been completed, members of the group previously added to the // view dataset's ACL no longer require access to the source dataset to successfully query the // view - List srcAcl = new ArrayList<>(); - srcAcl.addAll(srcDataset.getAcl()); + List srcAcl = new ArrayList<>(srcDataset.getAcl()); srcAcl.add(Acl.of(new Acl.View(view.getTableId()))); srcDataset.toBuilder().setAcl(srcAcl).build().update(); System.out.println("Grant view access successfully"); diff --git a/samples/snippets/src/main/java/com/example/bigquery/InsertingDataTypes.java b/samples/snippets/src/main/java/com/example/bigquery/InsertingDataTypes.java index e3f2a7428..3d721e727 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/InsertingDataTypes.java +++ b/samples/snippets/src/main/java/com/example/bigquery/InsertingDataTypes.java @@ -41,56 +41,56 @@ public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. String datasetName = "MY_DATASET_NAME"; String tableName = "MY_TABLE_NAME"; - - // Inserting data types - Field name = Field.of("name", StandardSQLTypeName.STRING); - Field age = Field.of("age", StandardSQLTypeName.INT64); - Field school = - Field.newBuilder("school", StandardSQLTypeName.BYTES).setMode(Field.Mode.REPEATED).build(); - Field location = Field.of("location", StandardSQLTypeName.GEOGRAPHY); - Field measurements = - Field.newBuilder("measurements", StandardSQLTypeName.FLOAT64) - .setMode(Field.Mode.REPEATED) - .build(); - Field day = Field.of("day", StandardSQLTypeName.DATE); - Field firstTime = Field.of("firstTime", StandardSQLTypeName.DATETIME); - Field secondTime = Field.of("secondTime", StandardSQLTypeName.TIME); - Field thirdTime = Field.of("thirdTime", StandardSQLTypeName.TIMESTAMP); - Field datesTime = - Field.of("datesTime", StandardSQLTypeName.STRUCT, day, firstTime, secondTime, thirdTime); - Schema schema = Schema.of(name, age, school, location, measurements, datesTime); - - // Inserting Sample data - Map datesTimeContent = new HashMap<>(); - datesTimeContent.put("day", "2019-1-12"); - datesTimeContent.put("firstTime", "2019-02-17 11:24:00.000"); - datesTimeContent.put("secondTime", "14:00:00"); - datesTimeContent.put("thirdTime", "2020-04-27T18:07:25.356Z"); - - Map rowContent = new HashMap<>(); - rowContent.put("name", "Tom"); - rowContent.put("age", 30); - rowContent.put("school", "Test University".getBytes()); - rowContent.put("location", "POINT(1 2)"); - rowContent.put("measurements", new Float[] {50.05f, 100.5f}); - rowContent.put("datesTime", datesTimeContent); - - insertingDataTypes(datasetName, tableName, schema, rowContent); + insertingDataTypes(datasetName, tableName); } - public static void insertingDataTypes( - String datasetName, String tableName, Schema schema, Map rowContent) { + public static void insertingDataTypes(String datasetName, String tableName) { try { // Initialize client that will be used to send requests. This client only needs to be created // once, and can be reused for multiple requests. BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService(); + // Inserting data types + Field name = Field.of("name", StandardSQLTypeName.STRING); + Field age = Field.of("age", StandardSQLTypeName.INT64); + Field school = + Field.newBuilder("school", StandardSQLTypeName.BYTES) + .setMode(Field.Mode.REPEATED) + .build(); + Field location = Field.of("location", StandardSQLTypeName.GEOGRAPHY); + Field measurements = + Field.newBuilder("measurements", StandardSQLTypeName.FLOAT64) + .setMode(Field.Mode.REPEATED) + .build(); + Field day = Field.of("day", StandardSQLTypeName.DATE); + Field firstTime = Field.of("firstTime", StandardSQLTypeName.DATETIME); + Field secondTime = Field.of("secondTime", StandardSQLTypeName.TIME); + Field thirdTime = Field.of("thirdTime", StandardSQLTypeName.TIMESTAMP); + Field datesTime = + Field.of("datesTime", StandardSQLTypeName.STRUCT, day, firstTime, secondTime, thirdTime); + Schema schema = Schema.of(name, age, school, location, measurements, datesTime); + TableId tableId = TableId.of(datasetName, tableName); TableDefinition tableDefinition = StandardTableDefinition.of(schema); TableInfo tableInfo = TableInfo.newBuilder(tableId, tableDefinition).build(); bigquery.create(tableInfo); + // Inserting Sample data + Map datesTimeContent = new HashMap<>(); + datesTimeContent.put("day", "2019-1-12"); + datesTimeContent.put("firstTime", "2019-02-17 11:24:00.000"); + datesTimeContent.put("secondTime", "14:00:00"); + datesTimeContent.put("thirdTime", "2020-04-27T18:07:25.356Z"); + + Map rowContent = new HashMap<>(); + rowContent.put("name", "Tom"); + rowContent.put("age", 30); + rowContent.put("school", "Test University".getBytes()); + rowContent.put("location", "POINT(1 2)"); + rowContent.put("measurements", new Float[] {50.05f, 100.5f}); + rowContent.put("datesTime", datesTimeContent); + InsertAllResponse response = bigquery.insertAll(InsertAllRequest.newBuilder(tableId).addRow(rowContent).build()); diff --git a/samples/snippets/src/main/java/com/example/bigquery/LoadAvroFromGCS.java b/samples/snippets/src/main/java/com/example/bigquery/LoadAvroFromGcs.java similarity index 94% rename from samples/snippets/src/main/java/com/example/bigquery/LoadAvroFromGCS.java rename to samples/snippets/src/main/java/com/example/bigquery/LoadAvroFromGcs.java index a85f561ae..8d44960c9 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/LoadAvroFromGCS.java +++ b/samples/snippets/src/main/java/com/example/bigquery/LoadAvroFromGcs.java @@ -27,17 +27,17 @@ import com.google.cloud.bigquery.TableId; // Sample to load Avro data from Cloud Storage into a new BigQuery table -public class LoadAvroFromGCS { +public class LoadAvroFromGcs { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. String datasetName = "MY_DATASET_NAME"; String tableName = "MY_TABLE_NAME"; String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.avro"; - loadAvroFromGCS(datasetName, tableName, sourceUri); + loadAvroFromGcs(datasetName, tableName, sourceUri); } - public static void loadAvroFromGCS(String datasetName, String tableName, String sourceUri) { + public static void loadAvroFromGcs(String datasetName, String tableName, String sourceUri) { try { // Initialize client that will be used to send requests. This client only needs to be created // once, and can be reused for multiple requests. diff --git a/samples/snippets/src/main/java/com/example/bigquery/LoadAvroFromGCSTruncate.java b/samples/snippets/src/main/java/com/example/bigquery/LoadAvroFromGcsTruncate.java similarity index 95% rename from samples/snippets/src/main/java/com/example/bigquery/LoadAvroFromGCSTruncate.java rename to samples/snippets/src/main/java/com/example/bigquery/LoadAvroFromGcsTruncate.java index 211fd0834..c2bb261d3 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/LoadAvroFromGCSTruncate.java +++ b/samples/snippets/src/main/java/com/example/bigquery/LoadAvroFromGcsTruncate.java @@ -27,17 +27,17 @@ import com.google.cloud.bigquery.TableId; // Sample to overwrite the BigQuery table data by loading a AVRO file from GCS -public class LoadAvroFromGCSTruncate { +public class LoadAvroFromGcsTruncate { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. String datasetName = "MY_DATASET_NAME"; String tableName = "MY_TABLE_NAME"; String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.avro"; - loadAvroFromGCSTruncate(datasetName, tableName, sourceUri); + loadAvroFromGcsTruncate(datasetName, tableName, sourceUri); } - public static void loadAvroFromGCSTruncate( + public static void loadAvroFromGcsTruncate( String datasetName, String tableName, String sourceUri) { try { // Initialize client that will be used to send requests. This client only needs to be created diff --git a/samples/snippets/src/main/java/com/example/bigquery/LoadCsvFromGCSAutodetect.java b/samples/snippets/src/main/java/com/example/bigquery/LoadCsvFromGcsAutodetect.java similarity index 95% rename from samples/snippets/src/main/java/com/example/bigquery/LoadCsvFromGCSAutodetect.java rename to samples/snippets/src/main/java/com/example/bigquery/LoadCsvFromGcsAutodetect.java index 19153038d..544134925 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/LoadCsvFromGCSAutodetect.java +++ b/samples/snippets/src/main/java/com/example/bigquery/LoadCsvFromGcsAutodetect.java @@ -27,17 +27,17 @@ import com.google.cloud.bigquery.TableId; // Sample to load CSV data with autodetect schema from Cloud Storage into a new BigQuery table -public class LoadCsvFromGCSAutodetect { +public class LoadCsvFromGcsAutodetect { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. String datasetName = "MY_DATASET_NAME"; String tableName = "MY_TABLE_NAME"; String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.csv"; - loadCsvFromGCSAutodetect(datasetName, tableName, sourceUri); + loadCsvFromGcsAutodetect(datasetName, tableName, sourceUri); } - public static void loadCsvFromGCSAutodetect( + public static void loadCsvFromGcsAutodetect( String datasetName, String tableName, String sourceUri) { try { // Initialize client that will be used to send requests. This client only needs to be created diff --git a/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGCS.java b/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGcs.java similarity index 95% rename from samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGCS.java rename to samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGcs.java index a330647c4..f3268fb0b 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGCS.java +++ b/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGcs.java @@ -30,7 +30,7 @@ import com.google.cloud.bigquery.TableId; // Sample to load JSON data from Cloud Storage into a new BigQuery table -public class LoadJsonFromGCS { +public class LoadJsonFromGcs { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. @@ -41,10 +41,10 @@ public static void main(String[] args) { Schema.of( Field.of("name", StandardSQLTypeName.STRING), Field.of("post_abbr", StandardSQLTypeName.STRING)); - loadJsonFromGCS(datasetName, tableName, sourceUri, schema); + loadJsonFromGcs(datasetName, tableName, sourceUri, schema); } - public static void loadJsonFromGCS( + public static void loadJsonFromGcs( String datasetName, String tableName, String sourceUri, Schema schema) { try { // Initialize client that will be used to send requests. This client only needs to be created diff --git a/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGCSAutodetect.java b/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGcsAutodetect.java similarity index 94% rename from samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGCSAutodetect.java rename to samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGcsAutodetect.java index 96bcf49ed..1272bf847 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGCSAutodetect.java +++ b/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGcsAutodetect.java @@ -27,17 +27,17 @@ import com.google.cloud.bigquery.TableId; // Sample to load JSON data with autodetect schema from Cloud Storage into a new BigQuery table -public class LoadJsonFromGCSAutodetect { +public class LoadJsonFromGcsAutodetect { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. String datasetName = "MY_DATASET_NAME"; String tableName = "MY_TABLE_NAME"; String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.json"; - loadJsonFromGCSAutodetect(datasetName, tableName, sourceUri); + loadJsonFromGcsAutodetect(datasetName, tableName, sourceUri); } - public static void loadJsonFromGCSAutodetect( + public static void loadJsonFromGcsAutodetect( String datasetName, String tableName, String sourceUri) { try { // Initialize client that will be used to send requests. This client only needs to be created diff --git a/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGCSCMEK.java b/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGcsCmek.java similarity index 95% rename from samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGCSCMEK.java rename to samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGcsCmek.java index 3d187e6c2..f316440ac 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGCSCMEK.java +++ b/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGcsCmek.java @@ -28,7 +28,7 @@ import com.google.cloud.bigquery.TableId; // Sample to load JSON data with configuration key from Cloud Storage into a new BigQuery table -public class LoadJsonFromGCSCMEK { +public class LoadJsonFromGcsCmek { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. @@ -39,10 +39,10 @@ public static void main(String[] args) { // i.e. projects/{project}/locations/{location}/keyRings/{key_ring}/cryptoKeys/{cryptoKey} EncryptionConfiguration encryption = EncryptionConfiguration.newBuilder().setKmsKeyName(kmsKeyName).build(); - loadJsonFromGCSCMEK(datasetName, tableName, sourceUri, encryption); + loadJsonFromGcsCmek(datasetName, tableName, sourceUri, encryption); } - public static void loadJsonFromGCSCMEK( + public static void loadJsonFromGcsCmek( String datasetName, String tableName, String sourceUri, EncryptionConfiguration encryption) { try { // Initialize client that will be used to send requests. This client only needs to be created diff --git a/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGCSTruncate.java b/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGcsTruncate.java similarity index 95% rename from samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGCSTruncate.java rename to samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGcsTruncate.java index 2f4fa9730..0771c69d8 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGCSTruncate.java +++ b/samples/snippets/src/main/java/com/example/bigquery/LoadJsonFromGcsTruncate.java @@ -30,7 +30,7 @@ import com.google.cloud.bigquery.TableId; // Sample to overwrite the BigQuery table data by loading a JSON file from GCS -public class LoadJsonFromGCSTruncate { +public class LoadJsonFromGcsTruncate { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. @@ -41,10 +41,10 @@ public static void main(String[] args) { Schema.of( Field.of("name", StandardSQLTypeName.STRING), Field.of("post_abbr", StandardSQLTypeName.STRING)); - loadJsonFromGCSTruncate(datasetName, tableName, sourceUri, schema); + loadJsonFromGcsTruncate(datasetName, tableName, sourceUri, schema); } - public static void loadJsonFromGCSTruncate( + public static void loadJsonFromGcsTruncate( String datasetName, String tableName, String sourceUri, Schema schema) { try { // Initialize client that will be used to send requests. This client only needs to be created diff --git a/samples/snippets/src/main/java/com/example/bigquery/LoadOrcFromGCS.java b/samples/snippets/src/main/java/com/example/bigquery/LoadOrcFromGcs.java similarity index 95% rename from samples/snippets/src/main/java/com/example/bigquery/LoadOrcFromGCS.java rename to samples/snippets/src/main/java/com/example/bigquery/LoadOrcFromGcs.java index e2c19d2c7..0b471a084 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/LoadOrcFromGCS.java +++ b/samples/snippets/src/main/java/com/example/bigquery/LoadOrcFromGcs.java @@ -30,7 +30,7 @@ import com.google.cloud.bigquery.TableId; // Sample to load ORC data from Cloud Storage into a new BigQuery table -public class LoadOrcFromGCS { +public class LoadOrcFromGcs { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. @@ -41,10 +41,10 @@ public static void main(String[] args) { Schema.of( Field.of("name", StandardSQLTypeName.STRING), Field.of("post_abbr", StandardSQLTypeName.STRING)); - loadOrcFromGCS(datasetName, tableName, sourceUri, schema); + loadOrcFromGcs(datasetName, tableName, sourceUri, schema); } - public static void loadOrcFromGCS( + public static void loadOrcFromGcs( String datasetName, String tableName, String sourceUri, Schema schema) { try { // Initialize client that will be used to send requests. This client only needs to be created diff --git a/samples/snippets/src/main/java/com/example/bigquery/QueryDestinationTableCMEK.java b/samples/snippets/src/main/java/com/example/bigquery/QueryDestinationTableCmek.java similarity index 94% rename from samples/snippets/src/main/java/com/example/bigquery/QueryDestinationTableCMEK.java rename to samples/snippets/src/main/java/com/example/bigquery/QueryDestinationTableCmek.java index 5e214164c..bfd2c0fd0 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/QueryDestinationTableCMEK.java +++ b/samples/snippets/src/main/java/com/example/bigquery/QueryDestinationTableCmek.java @@ -25,7 +25,7 @@ import com.google.cloud.bigquery.TableResult; // Sample to query on destination table with encryption key -public class QueryDestinationTableCMEK { +public class QueryDestinationTableCmek { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. @@ -36,10 +36,10 @@ public static void main(String[] args) { String.format("SELECT stringField, booleanField FROM %s.%s", datasetName, tableName); EncryptionConfiguration encryption = EncryptionConfiguration.newBuilder().setKmsKeyName(kmsKeyName).build(); - queryDestinationTableCMEK(query, encryption); + queryDestinationTableCmek(query, encryption); } - public static void queryDestinationTableCMEK(String query, EncryptionConfiguration encryption) { + public static void queryDestinationTableCmek(String query, EncryptionConfiguration encryption) { try { // Initialize client that will be used to send requests. This client only needs to be created // once, and can be reused for multiple requests. diff --git a/samples/snippets/src/main/java/com/example/bigquery/QueryExternalGCSPerm.java b/samples/snippets/src/main/java/com/example/bigquery/QueryExternalGcsPerm.java similarity index 95% rename from samples/snippets/src/main/java/com/example/bigquery/QueryExternalGCSPerm.java rename to samples/snippets/src/main/java/com/example/bigquery/QueryExternalGcsPerm.java index aba670102..14e3a9eea 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/QueryExternalGCSPerm.java +++ b/samples/snippets/src/main/java/com/example/bigquery/QueryExternalGcsPerm.java @@ -31,7 +31,7 @@ import com.google.cloud.bigquery.TableResult; // Sample to queries an external data source using a permanent table -public class QueryExternalGCSPerm { +public class QueryExternalGcsPerm { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. @@ -44,10 +44,10 @@ public static void main(String[] args) { Field.of("post_abbr", StandardSQLTypeName.STRING)); String query = String.format("SELECT * FROM %s.%s WHERE name LIKE 'W%%'", datasetName, tableName); - queryExternalGCSPerm(datasetName, tableName, sourceUri, schema, query); + queryExternalGcsPerm(datasetName, tableName, sourceUri, schema, query); } - public static void queryExternalGCSPerm( + public static void queryExternalGcsPerm( String datasetName, String tableName, String sourceUri, Schema schema, String query) { try { // Initialize client that will be used to send requests. This client only needs to be created diff --git a/samples/snippets/src/main/java/com/example/bigquery/QueryExternalGCSTemp.java b/samples/snippets/src/main/java/com/example/bigquery/QueryExternalGcsTemp.java similarity index 95% rename from samples/snippets/src/main/java/com/example/bigquery/QueryExternalGCSTemp.java rename to samples/snippets/src/main/java/com/example/bigquery/QueryExternalGcsTemp.java index 8f7f69011..d08db13b8 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/QueryExternalGCSTemp.java +++ b/samples/snippets/src/main/java/com/example/bigquery/QueryExternalGcsTemp.java @@ -29,7 +29,7 @@ import com.google.cloud.bigquery.TableResult; // Sample to queries an external data source using a temporary table -public class QueryExternalGCSTemp { +public class QueryExternalGcsTemp { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. @@ -40,10 +40,10 @@ public static void main(String[] args) { Field.of("name", StandardSQLTypeName.STRING), Field.of("post_abbr", StandardSQLTypeName.STRING)); String query = String.format("SELECT * FROM %s WHERE name LIKE 'W%%'", tableName); - queryExternalGCSTemp(tableName, sourceUri, schema, query); + queryExternalGcsTemp(tableName, sourceUri, schema, query); } - public static void queryExternalGCSTemp( + public static void queryExternalGcsTemp( String tableName, String sourceUri, Schema schema, String query) { try { // Initialize client that will be used to send requests. This client only needs to be created diff --git a/samples/snippets/src/main/java/com/example/bigquery/TableInsertRowsWithoutRowIds.java b/samples/snippets/src/main/java/com/example/bigquery/TableInsertRowsWithoutRowIds.java index 369ecc05c..1befb593d 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/TableInsertRowsWithoutRowIds.java +++ b/samples/snippets/src/main/java/com/example/bigquery/TableInsertRowsWithoutRowIds.java @@ -24,7 +24,7 @@ import com.google.cloud.bigquery.InsertAllRequest; import com.google.cloud.bigquery.InsertAllResponse; import com.google.cloud.bigquery.TableId; -import java.util.ArrayList; +import com.google.common.collect.ImmutableList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -36,33 +36,29 @@ public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. String datasetName = "MY_DATASET_NAME"; String tableName = "MY_TABLE_NAME"; - // Create rows to insert - Map rowContent1 = new HashMap<>(); - rowContent1.put("stringField", "Phred Phlyntstone"); - rowContent1.put("numericField", 32); - Map rowContent2 = new HashMap<>(); - rowContent2.put("stringField", "Wylma Phlyntstone"); - rowContent2.put("numericField", 29); - List rowContent = new ArrayList<>(); - // insertId is null if not specified - rowContent.add(InsertAllRequest.RowToInsert.of(rowContent1)); - rowContent.add(InsertAllRequest.RowToInsert.of(rowContent2)); - tableInsertRowsWithoutRowIds(datasetName, tableName, rowContent); + tableInsertRowsWithoutRowIds(datasetName, tableName); } - public static void tableInsertRowsWithoutRowIds( - String datasetName, String tableName, Iterable rows) { + public static void tableInsertRowsWithoutRowIds(String datasetName, String tableName) { try { // Initialize client that will be used to send requests. This client only needs to be created // once, and can be reused for multiple requests. - BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService(); - - // Get table - TableId tableId = TableId.of(datasetName, tableName); - - // Inserts rowContent into datasetName:tableId. + final BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService(); + // Create rows to insert + Map rowContent1 = new HashMap<>(); + rowContent1.put("stringField", "Phred Phlyntstone"); + rowContent1.put("numericField", 32); + Map rowContent2 = new HashMap<>(); + rowContent2.put("stringField", "Wylma Phlyntstone"); + rowContent2.put("numericField", 29); InsertAllResponse response = - bigquery.insertAll(InsertAllRequest.newBuilder(tableId).setRows(rows).build()); + bigquery.insertAll( + InsertAllRequest.newBuilder(TableId.of(datasetName, tableName)) + .setRows( + ImmutableList.of( + InsertAllRequest.RowToInsert.of(rowContent1), + InsertAllRequest.RowToInsert.of(rowContent2))) + .build()); if (response.hasErrors()) { // If any of the insertions failed, this lets you inspect the errors diff --git a/samples/snippets/src/main/java/com/example/bigquery/UpdateTableCMEK.java b/samples/snippets/src/main/java/com/example/bigquery/UpdateTableCmek.java similarity index 94% rename from samples/snippets/src/main/java/com/example/bigquery/UpdateTableCMEK.java rename to samples/snippets/src/main/java/com/example/bigquery/UpdateTableCmek.java index 01ac37749..57fd54160 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/UpdateTableCMEK.java +++ b/samples/snippets/src/main/java/com/example/bigquery/UpdateTableCmek.java @@ -25,7 +25,7 @@ import com.google.cloud.bigquery.TableId; // Sample to update a cmek table -public class UpdateTableCMEK { +public class UpdateTableCmek { public static void main(String[] args) { // TODO(developer): Replace these variables before running the sample. @@ -36,10 +36,10 @@ public static void main(String[] args) { // i.e. projects/{project}/locations/{location}/keyRings/{key_ring}/cryptoKeys/{cryptoKey} EncryptionConfiguration encryption = EncryptionConfiguration.newBuilder().setKmsKeyName(kmsKeyName).build(); - updateTableCMEK(datasetName, tableName, encryption); + updateTableCmek(datasetName, tableName, encryption); } - public static void updateTableCMEK( + public static void updateTableCmek( String datasetName, String tableName, EncryptionConfiguration encryption) { try { // Initialize client that will be used to send requests. This client only needs to be created diff --git a/samples/snippets/src/main/java/com/example/bigquery/UpdateTableDML.java b/samples/snippets/src/main/java/com/example/bigquery/UpdateTableDml.java similarity index 97% rename from samples/snippets/src/main/java/com/example/bigquery/UpdateTableDML.java rename to samples/snippets/src/main/java/com/example/bigquery/UpdateTableDml.java index 13b06c0f8..d57b03ebf 100644 --- a/samples/snippets/src/main/java/com/example/bigquery/UpdateTableDML.java +++ b/samples/snippets/src/main/java/com/example/bigquery/UpdateTableDml.java @@ -37,16 +37,16 @@ import java.util.UUID; // Sample to update data in BigQuery tables using DML query -public class UpdateTableDML { +public class UpdateTableDml { public static void main(String[] args) throws IOException, InterruptedException { // TODO(developer): Replace these variables before running the sample. String datasetName = "MY_DATASET_NAME"; String tableName = "MY_TABLE_NAME"; - updateTableDML(datasetName, tableName); + updateTableDml(datasetName, tableName); } - public static void updateTableDML(String datasetName, String tableName) + public static void updateTableDml(String datasetName, String tableName) throws IOException, InterruptedException { try { // Initialize client that will be used to send requests. This client only needs to be created diff --git a/samples/snippets/src/test/java/com/example/bigquery/CopyTableCMEKIT.java b/samples/snippets/src/test/java/com/example/bigquery/CopyTableCmekIT.java similarity index 95% rename from samples/snippets/src/test/java/com/example/bigquery/CopyTableCMEKIT.java rename to samples/snippets/src/test/java/com/example/bigquery/CopyTableCmekIT.java index 659e94075..bd9ab8ebe 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/CopyTableCMEKIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/CopyTableCmekIT.java @@ -31,7 +31,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class CopyTableCMEKIT { +public class CopyTableCmekIT { private String sourceTableName; private String destinationTableName; @@ -70,7 +70,7 @@ public void setUp() { Field.of("booleanField", StandardSQLTypeName.BOOL)); EncryptionConfiguration configuration = EncryptionConfiguration.newBuilder().setKmsKeyName(BIGQUERY_KMS_KEY_NAME).build(); - CreateTableCMEK.createTableCMEK(BIGQUERY_DATASET_NAME, sourceTableName, schema, configuration); + CreateTableCmek.createTableCmek(BIGQUERY_DATASET_NAME, sourceTableName, schema, configuration); bout = new ByteArrayOutputStream(); out = new PrintStream(bout); @@ -86,10 +86,10 @@ public void tearDown() { } @Test - public void testCopyTableCMEK() { + public void testCopyTableCmek() { EncryptionConfiguration configuration = EncryptionConfiguration.newBuilder().setKmsKeyName(BIGQUERY_KMS_KEY_NAME).build(); - CopyTableCMEK.copyTableCMEK( + CopyTableCmek.copyTableCmek( BIGQUERY_DATASET_NAME, sourceTableName, BIGQUERY_DATASET_NAME, diff --git a/samples/snippets/src/test/java/com/example/bigquery/CreateModelIT.java b/samples/snippets/src/test/java/com/example/bigquery/CreateModelIT.java index b0bcb7ca6..1fd747464 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/CreateModelIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/CreateModelIT.java @@ -77,7 +77,7 @@ public void testCreateModel() { + "learn_rate=0.4, " + "learn_rate_strategy='constant' " + ") AS ( " - + " SELECT 'a' AS f1, 2.0 AS label " + + "SELECT 'a' AS f1, 2.0 AS label " + "UNION ALL " + "SELECT 'b' AS f1, 3.8 AS label " + ")"; diff --git a/samples/snippets/src/test/java/com/example/bigquery/CreateRoutineDDLIT.java b/samples/snippets/src/test/java/com/example/bigquery/CreateRoutineDDLIT.java deleted file mode 100644 index bf4ca903f..000000000 --- a/samples/snippets/src/test/java/com/example/bigquery/CreateRoutineDDLIT.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.example.bigquery; - -import static com.google.common.truth.Truth.assertThat; -import static junit.framework.TestCase.assertNotNull; - -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; -import java.util.UUID; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -public class CreateRoutineDDLIT { - - private String routineName; - private ByteArrayOutputStream bout; - private PrintStream out; - - private static final String PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT"); - private static final String BIGQUERY_DATASET_NAME = requireEnvVar("BIGQUERY_DATASET_NAME"); - - 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"); - requireEnvVar("BIGQUERY_DATASET_NAME"); - } - - @Before - public void setUp() { - routineName = "MY_ROUTINE_NAME_TEST_" + UUID.randomUUID().toString().substring(0, 8); - bout = new ByteArrayOutputStream(); - out = new PrintStream(bout); - System.setOut(out); - } - - @After - public void tearDown() { - // Clean up - DeleteRoutine.deleteRoutine(BIGQUERY_DATASET_NAME, routineName); - System.setOut(null); - } - - @Test - public void testCreateRoutineDDL() { - String sql = - "CREATE FUNCTION " - + "`" - + PROJECT_ID - + "." - + BIGQUERY_DATASET_NAME - + "." - + routineName - + "`" - + "( arr ARRAY>) AS ( (SELECT SUM(IF(elem.name = \"foo\",elem.val,null)) FROM UNNEST(arr) AS elem))"; - CreateRoutineDDL.createRoutineDDL(sql); - assertThat(bout.toString()).contains("Routine created successfully"); - } -} diff --git a/samples/snippets/src/test/java/com/example/bigquery/CreateRoutineDdlIT.java b/samples/snippets/src/test/java/com/example/bigquery/CreateRoutineDdlIT.java new file mode 100644 index 000000000..82c6288a1 --- /dev/null +++ b/samples/snippets/src/test/java/com/example/bigquery/CreateRoutineDdlIT.java @@ -0,0 +1,84 @@ +/* + * 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.bigquery; + +import static com.google.common.truth.Truth.assertThat; +import static junit.framework.TestCase.assertNotNull; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.UUID; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +public class CreateRoutineDdlIT { + + private String routineName; + private ByteArrayOutputStream bout; + private PrintStream out; + + private static final String PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT"); + private static final String BIGQUERY_DATASET_NAME = requireEnvVar("BIGQUERY_DATASET_NAME"); + + 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"); + requireEnvVar("BIGQUERY_DATASET_NAME"); + } + + @Before + public void setUp() { + routineName = "MY_ROUTINE_NAME_TEST_" + UUID.randomUUID().toString().substring(0, 8); + bout = new ByteArrayOutputStream(); + out = new PrintStream(bout); + System.setOut(out); + } + + @After + public void tearDown() { + // Clean up + DeleteRoutine.deleteRoutine(BIGQUERY_DATASET_NAME, routineName); + System.setOut(null); + } + + @Test + public void testCreateRoutineDdl() { + String sql = + "CREATE FUNCTION " + + "`" + + PROJECT_ID + + "." + + BIGQUERY_DATASET_NAME + + "." + + routineName + + "`" + + "( arr ARRAY>) AS " + + "( (SELECT SUM(IF(elem.name = \"foo\",elem.val,null)) FROM UNNEST(arr) AS elem))"; + CreateRoutineDdl.createRoutineDdl(sql); + assertThat(bout.toString()).contains("Routine created successfully"); + } +} diff --git a/samples/snippets/src/test/java/com/example/bigquery/CreateTableCMEKIT.java b/samples/snippets/src/test/java/com/example/bigquery/CreateTableCmekIT.java similarity index 95% rename from samples/snippets/src/test/java/com/example/bigquery/CreateTableCMEKIT.java rename to samples/snippets/src/test/java/com/example/bigquery/CreateTableCmekIT.java index 773440ce5..12d81f876 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/CreateTableCMEKIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/CreateTableCmekIT.java @@ -31,7 +31,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class CreateTableCMEKIT { +public class CreateTableCmekIT { private String tableName; private ByteArrayOutputStream bout; @@ -70,14 +70,14 @@ public void tearDown() { } @Test - public void testCreateTableCMEK() { + public void testCreateTableCmek() { Schema schema = Schema.of( Field.of("stringField", StandardSQLTypeName.STRING), Field.of("booleanField", StandardSQLTypeName.BOOL)); EncryptionConfiguration configuration = EncryptionConfiguration.newBuilder().setKmsKeyName(BIGQUERY_KMS_KEY_NAME).build(); - CreateTableCMEK.createTableCMEK(BIGQUERY_DATASET_NAME, tableName, schema, configuration); + CreateTableCmek.createTableCmek(BIGQUERY_DATASET_NAME, tableName, schema, configuration); assertThat(bout.toString()).contains("Table cmek created successfully"); } } diff --git a/samples/snippets/src/test/java/com/example/bigquery/DDLCreateViewIT.java b/samples/snippets/src/test/java/com/example/bigquery/DdlCreateViewIT.java similarity index 96% rename from samples/snippets/src/test/java/com/example/bigquery/DDLCreateViewIT.java rename to samples/snippets/src/test/java/com/example/bigquery/DdlCreateViewIT.java index 7d6e0dae1..422025980 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/DDLCreateViewIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/DdlCreateViewIT.java @@ -27,7 +27,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class DDLCreateViewIT { +public class DdlCreateViewIT { private String viewName; private ByteArrayOutputStream bout; @@ -66,7 +66,7 @@ public void tearDown() { } @Test - public void testDDLCreateView() { + public void testDdlCreateView() { String sql = "CREATE VIEW " + "`" @@ -86,7 +86,7 @@ public void testDDLCreateView() { + " AS SELECT name, state, year, number" + " FROM `bigquery-public-data.usa_names.usa_1910_current`" + " WHERE state LIKE 'W%'"; - DDLCreateView.ddlCreateView(sql); + DdlCreateView.ddlCreateView(sql); assertThat(bout.toString()).contains("View created successfully"); } } diff --git a/samples/snippets/src/test/java/com/example/bigquery/DeleteModelIT.java b/samples/snippets/src/test/java/com/example/bigquery/DeleteModelIT.java index 1933a3a7a..6fed1902b 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/DeleteModelIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/DeleteModelIT.java @@ -68,7 +68,7 @@ public void setUp() { + "learn_rate=0.4, " + "learn_rate_strategy='constant' " + ") AS ( " - + " SELECT 'a' AS f1, 2.0 AS label " + + "SELECT 'a' AS f1, 2.0 AS label " + "UNION ALL " + "SELECT 'b' AS f1, 3.8 AS label " + ")"; diff --git a/samples/snippets/src/test/java/com/example/bigquery/GetModelIT.java b/samples/snippets/src/test/java/com/example/bigquery/GetModelIT.java index 33cecba9f..91ea8695d 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/GetModelIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/GetModelIT.java @@ -68,7 +68,7 @@ public void setUp() { + "learn_rate=0.4, " + "learn_rate_strategy='constant' " + ") AS ( " - + " SELECT 'a' AS f1, 2.0 AS label " + + "SELECT 'a' AS f1, 2.0 AS label " + "UNION ALL " + "SELECT 'b' AS f1, 3.8 AS label " + ")"; diff --git a/samples/snippets/src/test/java/com/example/bigquery/GetTableLabelsIT.java b/samples/snippets/src/test/java/com/example/bigquery/GetTableLabelsIT.java index 11de46c39..9d2254140 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/GetTableLabelsIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/GetTableLabelsIT.java @@ -1,3 +1,19 @@ +/* + * 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.bigquery; import static com.google.common.truth.Truth.assertThat; diff --git a/samples/snippets/src/test/java/com/example/bigquery/InsertingDataTypesIT.java b/samples/snippets/src/test/java/com/example/bigquery/InsertingDataTypesIT.java index 72f69f22f..5ab4be972 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/InsertingDataTypesIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/InsertingDataTypesIT.java @@ -19,13 +19,8 @@ import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; -import com.google.cloud.bigquery.Field; -import com.google.cloud.bigquery.Schema; -import com.google.cloud.bigquery.StandardSQLTypeName; import java.io.ByteArrayOutputStream; import java.io.PrintStream; -import java.util.HashMap; -import java.util.Map; import java.util.UUID; import org.junit.After; import org.junit.Before; @@ -70,40 +65,7 @@ public void tearDown() { @Test public void testInsertingDataTypes() { - // Inserting data types - Field name = Field.of("name", StandardSQLTypeName.STRING); - Field age = Field.of("age", StandardSQLTypeName.INT64); - Field school = - Field.newBuilder("school", StandardSQLTypeName.BYTES).setMode(Field.Mode.REPEATED).build(); - Field location = Field.of("location", StandardSQLTypeName.GEOGRAPHY); - Field measurements = - Field.newBuilder("measurements", StandardSQLTypeName.FLOAT64) - .setMode(Field.Mode.REPEATED) - .build(); - Field day = Field.of("day", StandardSQLTypeName.DATE); - Field firstTime = Field.of("firstTime", StandardSQLTypeName.DATETIME); - Field secondTime = Field.of("secondTime", StandardSQLTypeName.TIME); - Field thirdTime = Field.of("thirdTime", StandardSQLTypeName.TIMESTAMP); - Field datesTime = - Field.of("datesTime", StandardSQLTypeName.STRUCT, day, firstTime, secondTime, thirdTime); - Schema schema = Schema.of(name, age, school, location, measurements, datesTime); - - // Inserting Sample data - Map datesTimeContent = new HashMap<>(); - datesTimeContent.put("day", "2019-1-12"); - datesTimeContent.put("firstTime", "2019-02-17 11:24:00.000"); - datesTimeContent.put("secondTime", "14:00:00"); - datesTimeContent.put("thirdTime", "2020-04-27T18:07:25.356Z"); - - Map rowContent = new HashMap<>(); - rowContent.put("name", "Tom"); - rowContent.put("age", 30); - rowContent.put("school", "Test University".getBytes()); - rowContent.put("location", "POINT(1 2)"); - rowContent.put("measurements", new Float[] {50.05f, 100.5f}); - rowContent.put("datesTime", datesTimeContent); - - InsertingDataTypes.insertingDataTypes(BIGQUERY_DATASET_NAME, tableName, schema, rowContent); + InsertingDataTypes.insertingDataTypes(BIGQUERY_DATASET_NAME, tableName); assertThat(bout.toString()).contains("Rows successfully inserted into table"); } } diff --git a/samples/snippets/src/test/java/com/example/bigquery/ListModelsIT.java b/samples/snippets/src/test/java/com/example/bigquery/ListModelsIT.java index da0e19b26..c5dded50f 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/ListModelsIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/ListModelsIT.java @@ -68,7 +68,7 @@ public void setUp() { + "learn_rate=0.4, " + "learn_rate_strategy='constant' " + ") AS ( " - + " SELECT 'a' AS f1, 2.0 AS label " + + "SELECT 'a' AS f1, 2.0 AS label " + "UNION ALL " + "SELECT 'b' AS f1, 3.8 AS label " + ")"; diff --git a/samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGCSIT.java b/samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGCSIT.java deleted file mode 100644 index 6ccbdea90..000000000 --- a/samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGCSIT.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.example.bigquery; - -import static com.google.common.truth.Truth.assertThat; -import static junit.framework.TestCase.assertNotNull; - -import com.google.cloud.bigquery.Schema; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; -import java.util.UUID; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -public class LoadAvroFromGCSIT { - - private String tableName; - private ByteArrayOutputStream bout; - private PrintStream out; - - private static final String BIGQUERY_DATASET_NAME = requireEnvVar("BIGQUERY_DATASET_NAME"); - - 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("BIGQUERY_DATASET_NAME"); - } - - @Before - public void setUp() { - bout = new ByteArrayOutputStream(); - out = new PrintStream(bout); - System.setOut(out); - - // Create a test table - tableName = "MY_LOAD_AVRO_TABLE_FROM_GCS_TEST_" + UUID.randomUUID().toString().substring(0, 8); - CreateTable.createTable(BIGQUERY_DATASET_NAME, tableName, Schema.of()); - - bout = new ByteArrayOutputStream(); - out = new PrintStream(bout); - System.setOut(out); - } - - @After - public void tearDown() { - // Clean up - DeleteTable.deleteTable(BIGQUERY_DATASET_NAME, tableName); - System.setOut(null); - } - - @Test - public void loadLoadAvroFromGCS() { - String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.avro"; - LoadAvroFromGCS.loadAvroFromGCS(BIGQUERY_DATASET_NAME, tableName, sourceUri); - assertThat(bout.toString()).contains("Avro from GCS successfully loaded in a table"); - } -} diff --git a/samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGcsIT.java b/samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGcsIT.java new file mode 100644 index 000000000..c00f91bdb --- /dev/null +++ b/samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGcsIT.java @@ -0,0 +1,80 @@ +/* + * 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.bigquery; + +import static com.google.common.truth.Truth.assertThat; +import static junit.framework.TestCase.assertNotNull; + +import com.google.cloud.bigquery.Schema; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.UUID; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +public class LoadAvroFromGcsIT { + + private String tableName; + private ByteArrayOutputStream bout; + private PrintStream out; + + private static final String BIGQUERY_DATASET_NAME = requireEnvVar("BIGQUERY_DATASET_NAME"); + + 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("BIGQUERY_DATASET_NAME"); + } + + @Before + public void setUp() { + bout = new ByteArrayOutputStream(); + out = new PrintStream(bout); + System.setOut(out); + + // Create a test table + tableName = "MY_LOAD_AVRO_TABLE_FROM_GCS_TEST_" + UUID.randomUUID().toString().substring(0, 8); + CreateTable.createTable(BIGQUERY_DATASET_NAME, tableName, Schema.of()); + + bout = new ByteArrayOutputStream(); + out = new PrintStream(bout); + System.setOut(out); + } + + @After + public void tearDown() { + // Clean up + DeleteTable.deleteTable(BIGQUERY_DATASET_NAME, tableName); + System.setOut(null); + } + + @Test + public void loadLoadAvroFromGcs() { + String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.avro"; + LoadAvroFromGcs.loadAvroFromGcs(BIGQUERY_DATASET_NAME, tableName, sourceUri); + assertThat(bout.toString()).contains("Avro from GCS successfully loaded in a table"); + } +} diff --git a/samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGCSTruncateIT.java b/samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGcsTruncateIT.java similarity index 93% rename from samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGCSTruncateIT.java rename to samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGcsTruncateIT.java index 23e1868cb..8f54af6e5 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGCSTruncateIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/LoadAvroFromGcsTruncateIT.java @@ -28,7 +28,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class LoadAvroFromGCSTruncateIT { +public class LoadAvroFromGcsTruncateIT { private String tableName; private ByteArrayOutputStream bout; @@ -72,9 +72,9 @@ public void tearDown() { } @Test - public void loadLoadAvroFromGCSTruncate() { + public void loadLoadAvroFromGcsTruncate() { String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.avro"; - LoadAvroFromGCSTruncate.loadAvroFromGCSTruncate(BIGQUERY_DATASET_NAME, tableName, sourceUri); + LoadAvroFromGcsTruncate.loadAvroFromGcsTruncate(BIGQUERY_DATASET_NAME, tableName, sourceUri); assertThat(bout.toString()) .contains("Table is successfully overwritten by AVRO file loaded from GCS"); } diff --git a/samples/snippets/src/test/java/com/example/bigquery/LoadCsvFromGCSAutodetectIT.java b/samples/snippets/src/test/java/com/example/bigquery/LoadCsvFromGcsAutodetectIT.java similarity index 93% rename from samples/snippets/src/test/java/com/example/bigquery/LoadCsvFromGCSAutodetectIT.java rename to samples/snippets/src/test/java/com/example/bigquery/LoadCsvFromGcsAutodetectIT.java index a08dad220..f4c6abfc0 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/LoadCsvFromGCSAutodetectIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/LoadCsvFromGcsAutodetectIT.java @@ -28,7 +28,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class LoadCsvFromGCSAutodetectIT { +public class LoadCsvFromGcsAutodetectIT { private String tableName; private ByteArrayOutputStream bout; @@ -73,9 +73,9 @@ public void tearDown() { } @Test - public void testLoadCsvFromGCSAutodetect() { + public void testLoadCsvFromGcsAutodetect() { String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.csv"; - LoadCsvFromGCSAutodetect.loadCsvFromGCSAutodetect(BIGQUERY_DATASET_NAME, tableName, sourceUri); + LoadCsvFromGcsAutodetect.loadCsvFromGcsAutodetect(BIGQUERY_DATASET_NAME, tableName, sourceUri); assertThat(bout.toString()).contains("CSV Autodetect from GCS successfully loaded in a table"); } } diff --git a/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGCSAutodetectIT.java b/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGcsAutodetectIT.java similarity index 94% rename from samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGCSAutodetectIT.java rename to samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGcsAutodetectIT.java index bc46a4021..a8f37316a 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGCSAutodetectIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGcsAutodetectIT.java @@ -28,7 +28,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class LoadJsonFromGCSAutodetectIT { +public class LoadJsonFromGcsAutodetectIT { private String tableName; private ByteArrayOutputStream bout; @@ -74,9 +74,9 @@ public void tearDown() { } @Test - public void loadLoadJsonFromGCSAutodetect() { + public void loadLoadJsonFromGcsAutodetect() { String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.json"; - LoadJsonFromGCSAutodetect.loadJsonFromGCSAutodetect( + LoadJsonFromGcsAutodetect.loadJsonFromGcsAutodetect( BIGQUERY_DATASET_NAME, tableName, sourceUri); assertThat(bout.toString()).contains("Json Autodetect from GCS successfully loaded in a table"); } diff --git a/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGCSCMEKIT.java b/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGcsCmekIT.java similarity index 95% rename from samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGCSCMEKIT.java rename to samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGcsCmekIT.java index b435f219d..1df0f432c 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGCSCMEKIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGcsCmekIT.java @@ -28,7 +28,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class LoadJsonFromGCSCMEKIT { +public class LoadJsonFromGcsCmekIT { private String tableName; private ByteArrayOutputStream bout; @@ -68,11 +68,11 @@ public void tearDown() { } @Test - public void testLoadJsonFromGCSCMEK() { + public void testLoadJsonFromGcsCmek() { String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.json"; EncryptionConfiguration configuration = EncryptionConfiguration.newBuilder().setKmsKeyName(BIGQUERY_KMS_KEY_NAME).build(); - LoadJsonFromGCSCMEK.loadJsonFromGCSCMEK( + LoadJsonFromGcsCmek.loadJsonFromGcsCmek( BIGQUERY_DATASET_NAME, tableName, sourceUri, configuration); assertThat(bout.toString()) .contains("Table loaded succesfully from GCS with configuration key"); diff --git a/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGCSIT.java b/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGcsIT.java similarity index 95% rename from samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGCSIT.java rename to samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGcsIT.java index 8b2cf28d9..c0a262447 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGCSIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGcsIT.java @@ -30,7 +30,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class LoadJsonFromGCSIT { +public class LoadJsonFromGcsIT { private String tableName; private ByteArrayOutputStream bout; @@ -74,13 +74,13 @@ public void tearDown() { } @Test - public void loadLoadJsonFromGCS() { + public void loadLoadJsonFromGcs() { String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.json"; Schema schema = Schema.of( Field.of("name", StandardSQLTypeName.STRING), Field.of("post_abbr", StandardSQLTypeName.STRING)); - LoadJsonFromGCS.loadJsonFromGCS(BIGQUERY_DATASET_NAME, tableName, sourceUri, schema); + LoadJsonFromGcs.loadJsonFromGcs(BIGQUERY_DATASET_NAME, tableName, sourceUri, schema); assertThat(bout.toString()).contains("Json from GCS successfully loaded in a table"); } } diff --git a/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGCSTruncateIT.java b/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGcsTruncateIT.java similarity index 94% rename from samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGCSTruncateIT.java rename to samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGcsTruncateIT.java index 4e3b5ebb3..237c2a66a 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGCSTruncateIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/LoadJsonFromGcsTruncateIT.java @@ -30,7 +30,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class LoadJsonFromGCSTruncateIT { +public class LoadJsonFromGcsTruncateIT { private String tableName; private ByteArrayOutputStream bout; @@ -67,13 +67,13 @@ public void tearDown() { } @Test - public void loadLoadJsonFromGCSTruncate() { + public void loadLoadJsonFromGcsTruncate() { String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.json"; Schema schema = Schema.of( Field.of("name", StandardSQLTypeName.STRING), Field.of("post_abbr", StandardSQLTypeName.STRING)); - LoadJsonFromGCSTruncate.loadJsonFromGCSTruncate( + LoadJsonFromGcsTruncate.loadJsonFromGcsTruncate( BIGQUERY_DATASET_NAME, tableName, sourceUri, schema); assertThat(bout.toString()) .contains("Table is successfully overwritten by JSON file loaded from GCS"); diff --git a/samples/snippets/src/test/java/com/example/bigquery/LoadOrcFromGCSIT.java b/samples/snippets/src/test/java/com/example/bigquery/LoadOrcFromGcsIT.java similarity index 94% rename from samples/snippets/src/test/java/com/example/bigquery/LoadOrcFromGCSIT.java rename to samples/snippets/src/test/java/com/example/bigquery/LoadOrcFromGcsIT.java index fe4cb6d83..36dc97643 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/LoadOrcFromGCSIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/LoadOrcFromGcsIT.java @@ -30,7 +30,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class LoadOrcFromGCSIT { +public class LoadOrcFromGcsIT { private String tableName; private ByteArrayOutputStream bout; @@ -68,13 +68,13 @@ public void tearDown() { } @Test - public void testLoadOrcFromGCS() { + public void testLoadOrcFromGcs() { String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.orc"; Schema schema = Schema.of( Field.of("name", StandardSQLTypeName.STRING), Field.of("post_abbr", StandardSQLTypeName.STRING)); - LoadOrcFromGCS.loadOrcFromGCS(BIGQUERY_DATASET_NAME, tableName, sourceUri, schema); + LoadOrcFromGcs.loadOrcFromGcs(BIGQUERY_DATASET_NAME, tableName, sourceUri, schema); assertThat(bout.toString()).contains("ORC from GCS successfully added during load append job"); } } diff --git a/samples/snippets/src/test/java/com/example/bigquery/QueryDestinationTableCMEKIT.java b/samples/snippets/src/test/java/com/example/bigquery/QueryDestinationTableCmekIT.java similarity index 93% rename from samples/snippets/src/test/java/com/example/bigquery/QueryDestinationTableCMEKIT.java rename to samples/snippets/src/test/java/com/example/bigquery/QueryDestinationTableCmekIT.java index f4e0669d3..9accffd43 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/QueryDestinationTableCMEKIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/QueryDestinationTableCmekIT.java @@ -31,7 +31,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class QueryDestinationTableCMEKIT { +public class QueryDestinationTableCmekIT { private String tableName; private EncryptionConfiguration encryption; @@ -68,7 +68,7 @@ public void setUp() { Field.of("stringField", StandardSQLTypeName.STRING), Field.of("booleanField", StandardSQLTypeName.BOOL)); encryption = EncryptionConfiguration.newBuilder().setKmsKeyName(BIGQUERY_KMS_KEY_NAME).build(); - CreateTableCMEK.createTableCMEK(BIGQUERY_DATASET_NAME, tableName, schema, encryption); + CreateTableCmek.createTableCmek(BIGQUERY_DATASET_NAME, tableName, schema, encryption); bout = new ByteArrayOutputStream(); out = new PrintStream(bout); @@ -83,11 +83,11 @@ public void tearDown() { } @Test - public void testQueryDestinationTableCMEK() { + public void testQueryDestinationTableCmek() { String query = String.format( "SELECT stringField, booleanField FROM %s.%s", BIGQUERY_DATASET_NAME, tableName); - QueryDestinationTableCMEK.queryDestinationTableCMEK(query, encryption); + QueryDestinationTableCmek.queryDestinationTableCmek(query, encryption); assertThat(bout.toString()).contains("Query performed successfully with encryption key."); } } diff --git a/samples/snippets/src/test/java/com/example/bigquery/QueryExternalGCSPermIT.java b/samples/snippets/src/test/java/com/example/bigquery/QueryExternalGcsPermIT.java similarity index 95% rename from samples/snippets/src/test/java/com/example/bigquery/QueryExternalGCSPermIT.java rename to samples/snippets/src/test/java/com/example/bigquery/QueryExternalGcsPermIT.java index 6007fcacb..3596ec1ad 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/QueryExternalGCSPermIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/QueryExternalGcsPermIT.java @@ -30,7 +30,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class QueryExternalGCSPermIT { +public class QueryExternalGcsPermIT { private String tableName; private ByteArrayOutputStream bout; @@ -72,7 +72,7 @@ public void tearDown() { } @Test - public void testQueryExternalGCSPerm() { + public void testQueryExternalGcsPerm() { String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.csv"; Schema schema = Schema.of( @@ -81,7 +81,7 @@ public void testQueryExternalGCSPerm() { String query = String.format( "SELECT * FROM %s.%s WHERE name LIKE 'W%%'", BIGQUERY_DATASET_NAME, tableName); - QueryExternalGCSPerm.queryExternalGCSPerm( + QueryExternalGcsPerm.queryExternalGcsPerm( BIGQUERY_DATASET_NAME, tableName, sourceUri, schema, query); assertThat(bout.toString()) .contains("Query on external permanent table performed successfully."); diff --git a/samples/snippets/src/test/java/com/example/bigquery/QueryExternalGCSTempIT.java b/samples/snippets/src/test/java/com/example/bigquery/QueryExternalGcsTempIT.java similarity index 92% rename from samples/snippets/src/test/java/com/example/bigquery/QueryExternalGCSTempIT.java rename to samples/snippets/src/test/java/com/example/bigquery/QueryExternalGcsTempIT.java index e18d1ba9e..5dca6b3e1 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/QueryExternalGCSTempIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/QueryExternalGcsTempIT.java @@ -28,7 +28,7 @@ import org.junit.Before; import org.junit.Test; -public class QueryExternalGCSTempIT { +public class QueryExternalGcsTempIT { private ByteArrayOutputStream bout; private PrintStream out; @@ -46,7 +46,7 @@ public void tearDown() { } @Test - public void testQueryExternalGCSTemp() { + public void testQueryExternalGcsTemp() { String tableName = "EXTERNAL_CSV_TEMP_TABLE_FROM_GCS_TEST_" + UUID.randomUUID().toString().substring(0, 8); String sourceUri = "gs://cloud-samples-data/bigquery/us-states/us-states.csv"; @@ -55,7 +55,7 @@ public void testQueryExternalGCSTemp() { Field.of("name", StandardSQLTypeName.STRING), Field.of("post_abbr", StandardSQLTypeName.STRING)); String query = String.format("SELECT * FROM %s WHERE name LIKE 'W%%'", tableName); - QueryExternalGCSTemp.queryExternalGCSTemp(tableName, sourceUri, schema, query); + QueryExternalGcsTemp.queryExternalGcsTemp(tableName, sourceUri, schema, query); assertThat(bout.toString()) .contains("Query on external temporary table performed successfully."); } diff --git a/samples/snippets/src/test/java/com/example/bigquery/TableInsertRowsWithoutRowIdsIT.java b/samples/snippets/src/test/java/com/example/bigquery/TableInsertRowsWithoutRowIdsIT.java index 8441fc738..6c5fd02bd 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/TableInsertRowsWithoutRowIdsIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/TableInsertRowsWithoutRowIdsIT.java @@ -20,15 +20,10 @@ import static junit.framework.TestCase.assertNotNull; import com.google.cloud.bigquery.Field; -import com.google.cloud.bigquery.InsertAllRequest; import com.google.cloud.bigquery.LegacySQLTypeName; import com.google.cloud.bigquery.Schema; import java.io.ByteArrayOutputStream; import java.io.PrintStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.UUID; import org.junit.After; import org.junit.Before; @@ -83,18 +78,7 @@ public void tearDown() { @Test public void testTableInsertRowsWithoutRowIds() { - // Create rows to insert - Map rowContent1 = new HashMap<>(); - rowContent1.put("stringField", "Phred Phlyntstone"); - rowContent1.put("numericField", 32); - Map rowContent2 = new HashMap<>(); - rowContent2.put("stringField", "Wylma Phlyntstone"); - rowContent2.put("numericField", 29); - List rowContent = new ArrayList<>(); - rowContent.add(InsertAllRequest.RowToInsert.of(rowContent1)); - rowContent.add(InsertAllRequest.RowToInsert.of(rowContent2)); - TableInsertRowsWithoutRowIds.tableInsertRowsWithoutRowIds( - BIGQUERY_DATASET_NAME, tableName, rowContent); + TableInsertRowsWithoutRowIds.tableInsertRowsWithoutRowIds(BIGQUERY_DATASET_NAME, tableName); assertThat(bout.toString()).contains("Rows successfully inserted into table without row ids"); } } diff --git a/samples/snippets/src/test/java/com/example/bigquery/UpdateModelDescriptionIT.java b/samples/snippets/src/test/java/com/example/bigquery/UpdateModelDescriptionIT.java index 50c454ab0..bda7e8b56 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/UpdateModelDescriptionIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/UpdateModelDescriptionIT.java @@ -67,7 +67,7 @@ public void setUp() { + "learn_rate=0.4, " + "learn_rate_strategy='constant' " + ") AS ( " - + " SELECT 'a' AS f1, 2.0 AS label " + + "SELECT 'a' AS f1, 2.0 AS label " + "UNION ALL " + "SELECT 'b' AS f1, 3.8 AS label " + ")"; diff --git a/samples/snippets/src/test/java/com/example/bigquery/UpdateTableCMEKIT.java b/samples/snippets/src/test/java/com/example/bigquery/UpdateTableCmekIT.java similarity index 93% rename from samples/snippets/src/test/java/com/example/bigquery/UpdateTableCMEKIT.java rename to samples/snippets/src/test/java/com/example/bigquery/UpdateTableCmekIT.java index 6ec7de63a..38ddf9667 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/UpdateTableCMEKIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/UpdateTableCmekIT.java @@ -31,7 +31,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class UpdateTableCMEKIT { +public class UpdateTableCmekIT { private String tableName; private ByteArrayOutputStream bout; @@ -67,7 +67,7 @@ public void setUp() { Field.of("booleanField", StandardSQLTypeName.BOOL)); EncryptionConfiguration encryption = EncryptionConfiguration.newBuilder().setKmsKeyName(BIGQUERY_KMS_KEY_NAME).build(); - CreateTableCMEK.createTableCMEK(BIGQUERY_DATASET_NAME, tableName, schema, encryption); + CreateTableCmek.createTableCmek(BIGQUERY_DATASET_NAME, tableName, schema, encryption); bout = new ByteArrayOutputStream(); out = new PrintStream(bout); @@ -82,10 +82,10 @@ public void tearDown() { } @Test - public void testUpdateTableCMEK() { + public void testUpdateTableCmek() { EncryptionConfiguration encryption = EncryptionConfiguration.newBuilder().setKmsKeyName(BIGQUERY_KMS_KEY_NAME).build(); - UpdateTableCMEK.updateTableCMEK(BIGQUERY_DATASET_NAME, tableName, encryption); + UpdateTableCmek.updateTableCmek(BIGQUERY_DATASET_NAME, tableName, encryption); assertThat(bout.toString()).contains("Table cmek updated successfully"); } } diff --git a/samples/snippets/src/test/java/com/example/bigquery/UpdateTableDMLIT.java b/samples/snippets/src/test/java/com/example/bigquery/UpdateTableDmlIT.java similarity index 94% rename from samples/snippets/src/test/java/com/example/bigquery/UpdateTableDMLIT.java rename to samples/snippets/src/test/java/com/example/bigquery/UpdateTableDmlIT.java index 006ba13ce..ffaea442e 100644 --- a/samples/snippets/src/test/java/com/example/bigquery/UpdateTableDMLIT.java +++ b/samples/snippets/src/test/java/com/example/bigquery/UpdateTableDmlIT.java @@ -31,7 +31,7 @@ import org.junit.BeforeClass; import org.junit.Test; -public class UpdateTableDMLIT { +public class UpdateTableDmlIT { private String tableName; private ByteArrayOutputStream bout; @@ -83,8 +83,8 @@ public void tearDown() { } @Test - public void testUpdateTableDML() throws IOException, InterruptedException { - UpdateTableDML.updateTableDML(BIGQUERY_DATASET_NAME, tableName); + public void testUpdateTableDml() throws IOException, InterruptedException { + UpdateTableDml.updateTableDml(BIGQUERY_DATASET_NAME, tableName); assertThat(bout.toString()).contains("Table updated successfully using DML"); } }