docs(samples): Refactoring events package (new)

README.md

@@ -85,9 +85,8 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-retail/tree/m
 | Write User Event | [source code](https://github.com/googleapis/java-retail/blob/main/samples/interactive-tutorials/src/main/java/events/WriteUserEvent.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-retail&page=editor&open_in_editor=samples/interactive-tutorials/src/main/java/events/WriteUserEvent.java) |
 | Events Create Big Query Table | [source code](https://github.com/googleapis/java-retail/blob/main/samples/interactive-tutorials/src/main/java/events/setup/EventsCreateBigQueryTable.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-retail&page=editor&open_in_editor=samples/interactive-tutorials/src/main/java/events/setup/EventsCreateBigQueryTable.java) |
 | Events Create Gcs Bucket | [source code](https://github.com/googleapis/java-retail/blob/main/samples/interactive-tutorials/src/main/java/events/setup/EventsCreateGcsBucket.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-retail&page=editor&open_in_editor=samples/interactive-tutorials/src/main/java/events/setup/EventsCreateGcsBucket.java) |
+| Remove Events Resources | [source code](https://github.com/googleapis/java-retail/blob/main/samples/interactive-tutorials/src/main/java/events/setup/RemoveEventsResources.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-retail&page=editor&open_in_editor=samples/interactive-tutorials/src/main/java/events/setup/RemoveEventsResources.java) |
 | Update User Events Json | [source code](https://github.com/googleapis/java-retail/blob/main/samples/interactive-tutorials/src/main/java/events/setup/UpdateUserEventsJson.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-retail&page=editor&open_in_editor=samples/interactive-tutorials/src/main/java/events/setup/UpdateUserEventsJson.java) |
-| Create Test Resources | [source code](https://github.com/googleapis/java-retail/blob/main/samples/interactive-tutorials/src/main/java/init/CreateTestResources.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-retail&page=editor&open_in_editor=samples/interactive-tutorials/src/main/java/init/CreateTestResources.java) |
-| Remove Test Resources | [source code](https://github.com/googleapis/java-retail/blob/main/samples/interactive-tutorials/src/main/java/init/RemoveTestResources.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-retail&page=editor&open_in_editor=samples/interactive-tutorials/src/main/java/init/RemoveTestResources.java) |
 | Add Fulfillment Places | [source code](https://github.com/googleapis/java-retail/blob/main/samples/interactive-tutorials/src/main/java/product/AddFulfillmentPlaces.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-retail&page=editor&open_in_editor=samples/interactive-tutorials/src/main/java/product/AddFulfillmentPlaces.java) |
 | Create Product | [source code](https://github.com/googleapis/java-retail/blob/main/samples/interactive-tutorials/src/main/java/product/CreateProduct.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-retail&page=editor&open_in_editor=samples/interactive-tutorials/src/main/java/product/CreateProduct.java) |
 | Crud Product | [source code](https://github.com/googleapis/java-retail/blob/main/samples/interactive-tutorials/src/main/java/product/CrudProduct.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-retail&page=editor&open_in_editor=samples/interactive-tutorials/src/main/java/product/CrudProduct.java) |

samples/interactive-tutorials/src/main/java/events/ImportUserEventsBigQuery.java

@@ -22,7 +22,7 @@
 
 package events;
 
-import com.google.cloud.ServiceOptions;
+import com.google.api.gax.rpc.NotFoundException;
 import com.google.cloud.bigquery.BigQueryException;
 import com.google.cloud.retail.v2.BigQuerySource;
 import com.google.cloud.retail.v2.ImportMetadata;
@@ -33,26 +33,30 @@
 import com.google.longrunning.Operation;
 import com.google.longrunning.OperationsClient;
 import java.io.IOException;
+import java.time.Instant;
+import java.util.concurrent.TimeUnit;
 
 public class ImportUserEventsBigQuery {
 
   public static void main(String[] args) throws IOException, InterruptedException {
     // TODO(developer): Replace these variables before running the sample.
-    String projectId = ServiceOptions.getDefaultProjectId();
+    String projectId = "your-project-id";
     String defaultCatalog =
         String.format("projects/%s/locations/global/catalogs/default_catalog", projectId);
-    // TO CHECK ERROR HANDLING PASTE THE INVALID CATALOG NAME HERE: defaultCatalog =
-    // "invalid_catalog_name"
+    // TO CHECK ERROR HANDLING PASTE THE INVALID CATALOG NAME HERE:
+    // defaultCatalog = "invalid_catalog_name";
     String datasetId = "user_events";
     String tableId = "events";
-    // TO CHECK ERROR HANDLING USE THE TABLE OF INVALID USER EVENTS: tableId = "events_some_invalid"
+    // TO CHECK ERROR HANDLING USE THE TABLE OF INVALID USER EVENTS:
+    // tableId = "events_some_invalid";
 
     importUserEventsFromBigQuery(projectId, defaultCatalog, datasetId, tableId);
   }
 
   public static void importUserEventsFromBigQuery(
       String projectId, String defaultCatalog, String datasetId, String tableId)
       throws IOException, InterruptedException {
+
     try {
       String dataSchema = "user_event";
 
@@ -75,30 +79,32 @@ public static void importUserEventsFromBigQuery(
 
       System.out.printf("Import user events from BigQuery source request: %s%n", importRequest);
 
-      // Initialize client that will be used to send requests. This client only needs to be created
-      // once, and can be reused for multiple requests. After completing all of your requests, call
-      // the "close" method on the client to safely clean up any remaining background resources.
+      // Initialize client that will be used to send requests. This client only
+      // needs to be created once, and can be reused for multiple requests. After
+      // completing all of your requests, call the "close" method on the client to
+      // safely clean up any remaining background resources.
       try (UserEventServiceClient serviceClient = UserEventServiceClient.create()) {
         String operationName =
             serviceClient.importUserEventsCallable().call(importRequest).getName();
 
-        System.out.printf("OperationName = %s\n", operationName);
+        System.out.printf("OperationName = %s%n", operationName);
         OperationsClient operationsClient = serviceClient.getOperationsClient();
         Operation operation = operationsClient.getOperation(operationName);
 
-        while (!operation.getDone()) {
+        Instant deadline = Instant.now().plusSeconds(60);
+
+        while (!operation.getDone() || Instant.now().isBefore(deadline)) {
           // Keep polling the operation periodically until the import task is done.
-          int awaitDuration = 30000;
-          Thread.sleep(awaitDuration);
+          TimeUnit.SECONDS.sleep(30);
           operation = operationsClient.getOperation(operationName);
         }
 
         if (operation.hasMetadata()) {
           ImportMetadata metadata = operation.getMetadata().unpack(ImportMetadata.class);
           System.out.printf(
-              "Number of successfully imported events: %s\n", metadata.getSuccessCount());
+              "Number of successfully imported events: %s%n", metadata.getSuccessCount());
           System.out.printf(
-              "Number of failures during the importing: %s\n", metadata.getFailureCount());
+              "Number of failures during the importing: %s%n", metadata.getFailureCount());
         }
 
         if (operation.hasResponse()) {
@@ -109,6 +115,8 @@ public static void importUserEventsFromBigQuery(
       }
     } catch (BigQueryException e) {
       System.out.printf("Exception message: %s", e.getMessage());
+    } catch (NotFoundException e) {
+      System.out.printf("Catalog name is not found.%n%s%n", e.getMessage());
     }
   }
 }

samples/interactive-tutorials/src/main/java/events/ImportUserEventsGcs.java

@@ -23,8 +23,7 @@
 package events;
 
 import com.google.api.gax.rpc.InvalidArgumentException;
-import com.google.cloud.ServiceOptions;
-import com.google.cloud.bigquery.BigQueryException;
+import com.google.api.gax.rpc.PermissionDeniedException;
 import com.google.cloud.retail.v2.GcsSource;
 import com.google.cloud.retail.v2.ImportErrorsConfig;
 import com.google.cloud.retail.v2.ImportMetadata;
@@ -34,91 +33,99 @@
 import com.google.cloud.retail.v2.UserEventServiceClient;
 import com.google.longrunning.Operation;
 import com.google.longrunning.OperationsClient;
-import events.setup.EventsCreateGcsBucket;
 import java.io.IOException;
+import java.time.Instant;
+import java.util.concurrent.TimeUnit;
 
 public class ImportUserEventsGcs {
 
   public static void main(String[] args) throws IOException, InterruptedException {
     // TODO(developer): Replace these variables before running the sample.
-    String projectId = ServiceOptions.getDefaultProjectId();
+    String projectId = "your-project-id";
     String defaultCatalog =
         String.format("projects/%s/locations/global/catalogs/default_catalog", projectId);
-    // TO CHECK ERROR HANDLING PASTE THE INVALID CATALOG NAME HERE: defaultCatalog =
-    // "invalid_catalog_name"
-    String gcsEventsObject = "user_events.json";
-    // TO CHECK ERROR HANDLING USE THE JSON WITH INVALID USER EVENT: gcsEventsObject =
-    // "user_events_some_invalid.json"
-
-    importUserEventsFromGcs(gcsEventsObject, defaultCatalog);
+    // TO CHECK ERROR HANDLING PASTE THE INVALID CATALOG NAME HERE:
+    // defaultCatalog = "invalid_catalog_name";
+    String bucketName = System.getenv("EVENTS_BUCKET_NAME");
+    String gcsUserEventsObject = "user_events.json";
+    // TO CHECK ERROR HANDLING USE THE JSON WITH INVALID USER EVENT:
+    // gcsUserEventsObject = "user_events_some_invalid.json";
+
+    importUserEventsFromGcs(defaultCatalog, bucketName, gcsUserEventsObject);
   }
 
-  public static void importUserEventsFromGcs(String gcsEventsObject, String defaultCatalog)
+  public static void importUserEventsFromGcs(
+      String defaultCatalog, String bucketName, String gcsUserEventsObject)
       throws IOException, InterruptedException {
-    try {
-      String gcsBucket = String.format("gs://%s", EventsCreateGcsBucket.getBucketName());
-      String gcsErrorsBucket = String.format("%s/error", gcsBucket);
-
-      GcsSource gcsSource =
-          GcsSource.newBuilder()
-              .addInputUris(String.format("%s/%s", gcsBucket, gcsEventsObject))
-              .build();
-
-      UserEventInputConfig inputConfig =
-          UserEventInputConfig.newBuilder().setGcsSource(gcsSource).build();
-
-      ImportErrorsConfig errorsConfig =
-          ImportErrorsConfig.newBuilder().setGcsPrefix(gcsErrorsBucket).build();
-
-      ImportUserEventsRequest importRequest =
-          ImportUserEventsRequest.newBuilder()
-              .setParent(defaultCatalog)
-              .setInputConfig(inputConfig)
-              .setErrorsConfig(errorsConfig)
-              .build();
-
-      System.out.printf("Import user events from google cloud source request: %s%n", importRequest);
-
-      // Initialize client that will be used to send requests. This client only needs to be created
-      // once, and can be reused for multiple requests. After completing all of your requests, call
-      // the "close" method on the client to safely clean up any remaining background resources.
-      try (UserEventServiceClient serviceClient = UserEventServiceClient.create()) {
-        String operationName =
-            serviceClient.importUserEventsCallable().call(importRequest).getName();
-
-        System.out.printf("OperationName = %s\n", operationName);
-
-        OperationsClient operationsClient = serviceClient.getOperationsClient();
-        Operation operation = operationsClient.getOperation(operationName);
-
-        while (!operation.getDone()) {
-          // Keep polling the operation periodically until the import task is done.
-          int awaitDuration = 30000;
-          Thread.sleep(awaitDuration);
-          operation = operationsClient.getOperation(operationName);
-        }
-
-        if (operation.hasMetadata()) {
-          ImportMetadata metadata = operation.getMetadata().unpack(ImportMetadata.class);
-          System.out.printf(
-              "Number of successfully imported events: %s\n", metadata.getSuccessCount());
-          System.out.printf(
-              "Number of failures during the importing: %s\n", metadata.getFailureCount());
-        }
-
-        if (operation.hasResponse()) {
-          ImportUserEventsResponse response =
-              operation.getResponse().unpack(ImportUserEventsResponse.class);
-          System.out.printf("Operation result: %s%n", response);
-        }
-      } catch (InvalidArgumentException e) {
+    String gcsBucket = String.format("gs://%s", bucketName);
+    String gcsErrorsBucket = String.format("%s/error", gcsBucket);
+
+    GcsSource gcsSource =
+        GcsSource.newBuilder()
+            .addInputUris(String.format("%s/%s", gcsBucket, gcsUserEventsObject))
+            .build();
+
+    UserEventInputConfig inputConfig =
+        UserEventInputConfig.newBuilder().setGcsSource(gcsSource).build();
+
+    System.out.println("GCS source: " + gcsSource.getInputUrisList());
+
+    ImportErrorsConfig errorsConfig =
+        ImportErrorsConfig.newBuilder().setGcsPrefix(gcsErrorsBucket).build();
+
+    ImportUserEventsRequest importRequest =
+        ImportUserEventsRequest.newBuilder()
+            .setParent(defaultCatalog)
+            .setInputConfig(inputConfig)
+            .setErrorsConfig(errorsConfig)
+            .build();
+    System.out.printf("Import user events from google cloud source request: %s%n", importRequest);
+
+    // Initialize client that will be used to send requests. This client only
+    // needs to be created once, and can be reused for multiple requests. After
+    // completing all of your requests, call the "close" method on the client to
+    // safely clean up any remaining background resources.
+    try (UserEventServiceClient serviceClient = UserEventServiceClient.create()) {
+      String operationName = serviceClient.importUserEventsCallable().call(importRequest).getName();
+
+      System.out.println("The operation was started.");
+      System.out.printf("OperationName = %s%n", operationName);
+
+      OperationsClient operationsClient = serviceClient.getOperationsClient();
+      Operation operation = operationsClient.getOperation(operationName);
+
+      Instant deadline = Instant.now().plusSeconds(60);
+
+      while (!operation.getDone() || Instant.now().isBefore(deadline)) {
+        System.out.println("Please wait till operation is done.");
+        TimeUnit.SECONDS.sleep(30);
+        operation = operationsClient.getOperation(operationName);
+      }
+
+      if (operation.hasMetadata()) {
+        ImportMetadata metadata = operation.getMetadata().unpack(ImportMetadata.class);
+        System.out.printf(
+            "Number of successfully imported events: %s%n", metadata.getSuccessCount());
         System.out.printf(
-            "Given GCS input path was not found. %n%s%n "
-                + "Please run CreateTestResources class to create resources.",
-            e.getMessage());
+            "Number of failures during the importing: %s%n", metadata.getFailureCount());
+      } else {
+        System.out.println("Metadata is empty.");
+      }
+
+      if (operation.hasResponse()) {
+        ImportUserEventsResponse response =
+            operation.getResponse().unpack(ImportUserEventsResponse.class);
+        System.out.printf("Operation result: %s%n", response);
+      } else {
+        System.out.println("Operation result is empty.");
       }
-    } catch (BigQueryException e) {
-      System.out.printf("Exception message: %s", e.getMessage());
+    } catch (InvalidArgumentException e) {
+      System.out.printf(
+          "%s%n'%s' file does not exist in the bucket. Please "
+              + "make sure you have followed the setting up instructions.",
+          e.getMessage(), gcsUserEventsObject);
+    } catch (PermissionDeniedException e) {
+      System.out.println(e.getMessage());
     }
   }
 }

samples/interactive-tutorials/src/main/java/events/ImportUserEventsInline.java

@@ -23,7 +23,6 @@
 package events;
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.ServiceOptions;
 import com.google.cloud.bigquery.BigQueryException;
 import com.google.cloud.retail.v2.ImportMetadata;
 import com.google.cloud.retail.v2.ImportUserEventsRequest;
@@ -46,7 +45,7 @@ public class ImportUserEventsInline {
   public static void main(String[] args)
       throws IOException, ExecutionException, InterruptedException {
     // TODO(developer): Replace these variables before running the sample.
-    String projectId = ServiceOptions.getDefaultProjectId();
+    String projectId = "your-project-id";
     String defaultCatalog =
         String.format("projects/%s/locations/global/catalogs/default_catalog", projectId);
 
@@ -90,9 +89,10 @@ public static void importUserEventsFromInlineSource(String defaultCatalog)
               .build();
       System.out.printf("Import user events from inline source request: %s%n", importRequest);
 
-      // Initialize client that will be used to send requests. This client only needs to be created
-      // once, and can be reused for multiple requests. After completing all of your requests, call
-      // the "close" method on the client to safely clean up any remaining background resources.
+      // Initialize client that will be used to send requests. This client only
+      // needs to be created once, and can be reused for multiple requests. After
+      // completing all of your requests, call the "close" method on the client to
+      // safely clean up any remaining background resources.
       try (UserEventServiceClient userEventServiceClient = UserEventServiceClient.create()) {
         OperationFuture<ImportUserEventsResponse, ImportMetadata> importOperation =
             userEventServiceClient.importUserEventsAsync(importRequest);