From 166d3b26a88ced83a9750cc5d5e1c4dc7f95a658 Mon Sep 17 00:00:00 2001
From: Peter Zheng <peterzh@google.com>
Date: Wed, 21 Nov 2018 15:25:59 -0800
Subject: [PATCH 1/2] [Asset] Add quickstart code for BatchGetAssetsHistory.

---
 .../asset/BatchGetAssetsHistoryExample.java   | 56 +++++++++++++++++++
 .../java/com/example/asset/QuickStartIT.java  | 10 ++++
 2 files changed, 66 insertions(+)
 create mode 100644 asset/cloud-client/src/main/java/com/example/asset/BatchGetAssetsHistoryExample.java

diff --git a/asset/cloud-client/src/main/java/com/example/asset/BatchGetAssetsHistoryExample.java b/asset/cloud-client/src/main/java/com/example/asset/BatchGetAssetsHistoryExample.java
new file mode 100644
index 00000000000..b1a5b3c2240
--- /dev/null
+++ b/asset/cloud-client/src/main/java/com/example/asset/BatchGetAssetsHistoryExample.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 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.asset;
+
+// [START asset_quickstart_batch_get_assets_history]
+// Imports the Google Cloud client library
+
+import com.google.cloud.ServiceOptions;
+import com.google.cloud.asset.v1beta1.AssetServiceClient;
+import com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest;
+import com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse;
+import com.google.cloud.asset.v1beta1.ContentType;
+import com.google.cloud.asset.v1beta1.ProjectName;
+import com.google.cloud.asset.v1beta1.TimeWindow;
+import java.util.Arrays;
+
+public class BatchGetAssetsHistoryExample {
+
+  // Use the default project Id.
+  private static final String projectId = ServiceOptions.getDefaultProjectId();
+
+  // Export assets for a project.
+  // @param args path where the results will be exported to.
+  public static void main(String... args) throws Exception {
+    // Asset names, e.g.: "//storage.googleapis.com/[BUCKET_NAME]"
+    String[] assetNames = args[0].split(",");
+    try (AssetServiceClient client = AssetServiceClient.create()) {
+      ProjectName parent = ProjectName.of(projectId);
+      ContentType contentType = ContentType.CONTENT_TYPE_UNSPECIFIED;
+      TimeWindow readTimeWindow = TimeWindow.newBuilder().build();
+      BatchGetAssetsHistoryRequest request = BatchGetAssetsHistoryRequest.newBuilder()
+          .setParent(parent.toString())
+          .addAllAssetNames(Arrays.asList(assetNames))
+          .setContentType(contentType)
+          .setReadTimeWindow(readTimeWindow)
+          .build();
+      BatchGetAssetsHistoryResponse response = client.batchGetAssetsHistory(request);
+      System.out.println(response);
+    }
+  }
+}
+// [END asset_quickstart_batch_get_assets_history]
diff --git a/asset/cloud-client/src/test/java/com/example/asset/QuickStartIT.java b/asset/cloud-client/src/test/java/com/example/asset/QuickStartIT.java
index 56bc0bb74ac..7c8ac920a65 100644
--- a/asset/cloud-client/src/test/java/com/example/asset/QuickStartIT.java
+++ b/asset/cloud-client/src/test/java/com/example/asset/QuickStartIT.java
@@ -81,4 +81,14 @@ public void testExportAssetExample() throws Exception {
     String got = bout.toString();
     assertThat(got).contains(String.format("uri: \"%s\"", assetDumpPath));
   }
+
+  @Test
+  public void testBatchGetAssetsHistory() throws Exception {
+    String bucketAssetName = String.format("//storage.googleapis.com/%s", bucketName);
+    BatchGetAssetsHistoryExample.main(bucketAssetName);
+    String got = bout.toString();
+    if (!got.isEmpty()) {
+      assertThat(got).contains(bucketAssetName);
+    }
+  }
 }

From 372d0862bd2669eca28dc4e6a1c80c810db65eb9 Mon Sep 17 00:00:00 2001
From: Peter Zheng <peterzh@google.com>
Date: Wed, 21 Nov 2018 16:44:14 -0800
Subject: [PATCH 2/2] [Asset] Minor fix: move comments.

---
 .../main/java/com/example/asset/ExportAssetsExample.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/asset/cloud-client/src/main/java/com/example/asset/ExportAssetsExample.java b/asset/cloud-client/src/main/java/com/example/asset/ExportAssetsExample.java
index d3858263c65..0dcfc30f714 100644
--- a/asset/cloud-client/src/main/java/com/example/asset/ExportAssetsExample.java
+++ b/asset/cloud-client/src/main/java/com/example/asset/ExportAssetsExample.java
@@ -16,6 +16,9 @@
 
 package com.example.asset;
 
+// [START asset_quickstart_export_assets]
+// Imports the Google Cloud client library
+
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.asset.v1beta1.AssetServiceClient;
 import com.google.cloud.asset.v1beta1.ExportAssetsRequest;
@@ -24,9 +27,6 @@
 import com.google.cloud.asset.v1beta1.OutputConfig;
 import com.google.cloud.asset.v1beta1.ProjectName;
 
-// [START asset_quickstart_export_assets]
-// Imports the Google Cloud client library
-
 public class ExportAssetsExample {
 
   // Use the default project Id.