Merge branch 'master' into master

Author: dzlier-gcp

bigquery/cloud-client/src/main/java/com/example/bigquery/UpdateDatasetAccess.java

@@ -50,7 +50,7 @@ public static void updateDatasetAccess(String datasetName) {
     ArrayList<Acl> acls = new ArrayList<>(dataset.getAcl());
     acls.add(newEntry);
 
-    //Update the dataset to use the new ACLs
+    // Update the dataset to use the new ACLs
     try {
       bigquery.update(dataset.toBuilder().setAcl(acls).build());
       System.out.println("Dataset Access Control updated successfully");

bigquery/cloud-client/src/main/java/com/example/bigquery/UpdateDatasetDescription.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2019 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;
+
+// [START bigquery_update_dataset_description]
+import com.google.cloud.bigquery.BigQuery;
+import com.google.cloud.bigquery.BigQueryException;
+import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.cloud.bigquery.Dataset;
+
+public class UpdateDatasetDescription {
+
+  public static void runUpdateDatasetDescription() {
+    // TODO(developer): Replace these variables before running the sample.
+    String datasetName = "my-dataset-name";
+    String newDescription = "this is the new dataset description";
+    updateDatasetDescription(datasetName, newDescription);
+  }
+
+  public static void updateDatasetDescription(String datasetName, String newDescription) {
+    // 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();
+
+    Dataset dataset = bigquery.getDataset(datasetName);
+
+    // Update dataset description
+    try {
+      bigquery.update(dataset.toBuilder().setDescription(newDescription).build());
+      System.out.println("Dataset description updated successfully to " + newDescription);
+    } catch (BigQueryException e) {
+      System.out.println("Dataset description was not updated \n" + e.toString());
+    }
+  }
+}
+// [END bigquery_update_dataset_description]

bigquery/cloud-client/src/test/java/com/example/bigquery/UpdateDatasetDescriptionIT.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2019 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 com.google.cloud.bigquery.testing.RemoteBigQueryHelper;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class UpdateDatasetDescriptionIT {
+  private ByteArrayOutputStream bout;
+  private PrintStream out;
+
+  @Before
+  public void setUp() throws Exception {
+    bout = new ByteArrayOutputStream();
+    out = new PrintStream(bout);
+    System.setOut(out);
+  }
+
+  @After
+  public void tearDown() {
+    System.setOut(null);
+  }
+
+  @Test
+  public void updateDatasetDescription() {
+    String generatedDatasetName = RemoteBigQueryHelper.generateDatasetName();
+    String newDescription = "new description!";
+    // Create a dataset in order to modify its description
+    CreateDataset.createDataset(generatedDatasetName);
+
+    // Modify dataset's description
+    UpdateDatasetDescription.updateDatasetDescription(generatedDatasetName, newDescription);
+    assertThat(bout.toString())
+        .contains("Dataset description updated successfully to " + newDescription);
+  }
+}

bigtable/snippets/pom.xml

@@ -37,6 +37,12 @@
       <version>4.13-beta-3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>1.0</version>
+      <scope>test</scope>
+    </dependency>
     <!-- https://mvnrepository.com/artifact/com.google.cloud/google-cloud-bigtable -->
     <dependency>
       <groupId>com.google.cloud</groupId>