updates product search region tags to standard

Author: alixhami

vision/product-search/cloud-client/src/main/java/com/example/vision/ImportProductSets.java

@@ -16,7 +16,7 @@
 
 package com.example.vision;
 
-// [START product_search_import]
+// [START vision_product_search_tutorial_import]
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.vision.v1p3beta1.BatchOperationMetadata;
 import com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource;
@@ -26,7 +26,7 @@
 import com.google.cloud.vision.v1p3beta1.LocationName;
 import com.google.cloud.vision.v1p3beta1.ProductSearchClient;
 import com.google.cloud.vision.v1p3beta1.ReferenceImage;
-
+// [END vision_product_search_tutorial_import]
 import java.io.PrintStream;
 import javax.swing.JPanel;
 
@@ -36,7 +36,6 @@
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import net.sourceforge.argparse4j.inf.Subparsers;
-// [END product_search_import]
 
 /**
  * This application demonstrates how to Import Product Sets in Cloud Vision
@@ -47,7 +46,7 @@
  */
 
 public class ImportProductSets extends JPanel {
-  // [START product_search_import_product_sets]
+  // [START vision_product_search_import_product_images]
   /**
    * Import images of different products in the product set.
    *
@@ -89,7 +88,7 @@ public static void importProductSets(String projectId, String computeRegion, Str
       }
     }
   }
-  // [END product_search_import_product_sets]
+  // [END vision_product_search_import_product_images]
 
   public static void main(String[] args) throws Exception {
     ImportProductSets importProductSet = new ImportProductSets();

vision/product-search/cloud-client/src/main/java/com/example/vision/ProductInProductSetManagement.java

@@ -16,7 +16,9 @@
 
 package com.example.vision;
 
-// [START product_search_import]
+// [START vision_product_search_remove_product_from_product_set]
+// [START vision_product_search_list_products]
+// [START vision_product_search_update_product_set]
 import com.google.cloud.vision.v1p3beta1.LocationName;
 import com.google.cloud.vision.v1p3beta1.Product;
 import com.google.cloud.vision.v1p3beta1.ProductName;
@@ -29,13 +31,15 @@
 import java.io.IOException;
 import java.io.PrintStream;
 
+// [END vision_product_search_remove_product_from_product_set]
+// [END vision_product_search_list_products]
+// [END vision_product_search_update_product_set]
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import net.sourceforge.argparse4j.inf.Subparsers;
-// [END product_search_import]
 
 /**
  * This application demonstrates how to perform basic operations with Products in a Product Set.
@@ -46,7 +50,7 @@
 
 public class ProductInProductSetManagement {
 
-  // [START product_search_add_product_to_product_set]
+  // [START vision_product_search_update_product_set]
   /**
    * Update a product set.
    *
@@ -56,7 +60,7 @@ public class ProductInProductSetManagement {
    * @param productSetDisplayName - Display name of the product set.
    * @throws IOException - on I/O errors.
    */
-  public static void addProductToProductSet(
+  public static void updateProductSet(
       String projectId, String computeRegion, String productSetId, String productSetDisplayName)
       throws IOException {
     ProductSearchClient client = ProductSearchClient.create();
@@ -92,9 +96,9 @@ public static void addProductToProductSet(
     System.out.println(
         String.format("Updated product set display name: %s", updatedProductSet.getDisplayName()));
   }
-  // [END product_search_add_product_to_product_set]
+  // [END vision_product_search_update_product_set]
 
-  // [START product_search_remove_product_from_product_set]
+  // [START vision_product_search_remove_product_from_product_set]
   /**
    * Remove a product from a product set.
    *
@@ -120,9 +124,9 @@ public static void removeProductFromProductSet(
 
     System.out.println(String.format("Product removed from product set."));
   }
-  // [END product_search_remove_product_from_product_set]
+  // [END vision_product_search_remove_product_from_product_set]
 
-  // [START product_search_list_products_in_product_set]
+  // [START vision_product_search_list_products_in_product_set]
   /**
    * List all products in a product set.
    *
@@ -154,9 +158,9 @@ public static void listProductsInProductSet(
           String.format("Product labels: %s\n", product.getProductLabelsList().toString()));
     }
   }
-  // [END product_search_list_products_in_product_set]
+  // [END vision_product_search_list_products_in_product_set]
 
-  // [START product_search_list_products]
+  // [START vision_product_search_list_products]
   /**
    * List all products.
    *
@@ -185,7 +189,7 @@ public static void listProducts(String projectId, String computeRegion) throws I
           String.format("Product labels: %s", product.getProductLabelsList().toString()));
     }
   }
-  // [END product_search_list_products]
+  // [END vision_product_search_list_products]
 
   public static void main(String[] args) throws Exception {
     ProductInProductSetManagement productInProductSetManagement =
@@ -220,7 +224,7 @@ public static void argsHelper(String[] args, PrintStream out) throws Exception {
         listProducts(projectId, computeRegion);
       }
       if (ns.get("command").equals("update_product_set")) {
-        addProductToProductSet(
+        updateProductSet(
             projectId,
             computeRegion,
             ns.getString("productSetId"),

vision/product-search/cloud-client/src/main/java/com/example/vision/ProductManagement.java

@@ -16,7 +16,10 @@
 
 package com.example.vision;
 
-// [START product_search_import]
+// [START vision_product_search_create_product]
+// [START vision_product_search_delete_product]
+// [START vision_product_search_get_product]
+// [START vision_product_search_update_product_labels]
 import com.google.cloud.vision.v1p3beta1.LocationName;
 import com.google.cloud.vision.v1p3beta1.Product;
 import com.google.cloud.vision.v1p3beta1.Product.KeyValue;
@@ -27,13 +30,16 @@
 import java.io.IOException;
 import java.io.PrintStream;
 
+// [END vision_product_search_create_product]
+// [END vision_product_search_delete_product]
+// [END vision_product_search_get_product]
+// [END vision_product_search_update_product_labels]
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import net.sourceforge.argparse4j.inf.Subparsers;
-// [END product_search_import]
 
 /**
  * This application demonstrates how to perform basic operations on Products.
@@ -44,7 +50,7 @@
 
 public class ProductManagement {
 
-  // [START product_search_create_product]
+  // [START vision_product_search_create_product]
   /**
    * Create one product.
    *
@@ -90,40 +96,9 @@ public static void createProduct(
     // Display the product information
     System.out.println(String.format("Product name: %s", product.getName()));
   }
-  // [END product_search_create_product]
+  // [END vision_product_search_create_product]
 
-  // [START product_search_list_products]
-  /**
-   * List all products.
-   *
-   * @param projectId - Id of the project.
-   * @param computeRegion - Region name.
-   * @throws IOException - on I/O errors.
-   */
-  public static void listProducts(String projectId, String computeRegion) throws IOException {
-    ProductSearchClient client = ProductSearchClient.create();
-
-    // A resource that represents Google Cloud Platform location.
-    LocationName projectLocation = LocationName.of(projectId, computeRegion);
-
-    // List all the products available in the region.
-    for (Product product : client.listProducts(projectLocation).iterateAll()) {
-      // Display the product information
-      System.out.println(String.format("\nProduct name: %s", product.getName()));
-      System.out.println(
-          String.format(
-              "Product id: %s",
-              product.getName().substring(product.getName().lastIndexOf('/') + 1)));
-      System.out.println(String.format("Product display name: %s", product.getDisplayName()));
-      System.out.println(String.format("Product category: %s", product.getProductCategory()));
-      System.out.println("Product labels:");
-      System.out.println(
-          String.format("Product labels: %s", product.getProductLabelsList().toString()));
-    }
-  }
-  // [END product_search_list_products]
-
-  // [START product_search_get_product]
+  // [START vision_product_search_get_product]
   /**
    * Get information about a product.
    *
@@ -154,9 +129,9 @@ public static void getProduct(String projectId, String computeRegion, String pro
     System.out.println(
         String.format("Product labels: %s", product.getProductLabelsList().toString()));
   }
-  // [END product_search_get_product]
+  // [END vision_product_search_get_product]
 
-  // [START product_search_update_product_labels]
+  // [START vision_product_search_update_product_labels]
   /**
    * Update the product labels.
    *
@@ -198,9 +173,9 @@ public static void updateProductLabels(
         String.format(
             "Updated product labels: %s", updatedProduct.getProductLabelsList().toString()));
   }
-  // [END product_search_update_product_labels]
+  // [END vision_product_search_update_product_labels]
 
-  // [START product_search_delete_product]
+  // [START vision_product_search_delete_product]
   /**
    * Delete the product and all its reference images.
    *
@@ -221,7 +196,7 @@ public static void deleteProduct(String projectId, String computeRegion, String
 
     System.out.println("Product deleted.");
   }
-  // [END product_search_delete_product]
+  // [END vision_product_search_delete_product]
 
   public static void main(String[] args) throws Exception {
     ProductManagement productManagement = new ProductManagement();
@@ -267,9 +242,6 @@ public void argsHelper(String[] args, PrintStream out) throws Exception {
             ns.getString("productDescription"),
             ns.getString("productLabels"));
       }
-      if (ns.get("command").equals("list_products")) {
-        listProducts(projectId, computeRegion);
-      }
       if (ns.get("command").equals("get_product")) {
         getProduct(projectId, computeRegion, ns.getString("productId"));
       }

vision/product-search/cloud-client/src/main/java/com/example/vision/ProductSearch.java

@@ -16,7 +16,7 @@
 
 package com.example.vision;
 
-// [START product_search_import]
+// [START vision_product_search_get_similar_products]
 import com.google.cloud.vision.v1p3beta1.AnnotateImageRequest;
 import com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse;
 import com.google.cloud.vision.v1p3beta1.Feature;
@@ -36,13 +36,13 @@
 import java.util.Arrays;
 import java.util.List;
 
+// [END vision_product_search_get_similar_products]
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import net.sourceforge.argparse4j.inf.Subparsers;
-// [END product_search_import]
 
 /**
  * This application demonstrates how to perform similar product search operation in Cloud Vision
@@ -54,7 +54,7 @@
 
 public class ProductSearch {
 
-  // [START product_search_get_similar_products_file]
+  // [START vision_product_search_get_similar_products]
   /**
    * Search similar products to image.
    *
@@ -130,7 +130,7 @@ public static void getSimilarProducts(
       System.out.println(String.format("Image name: %s", product.getImage()));
     }
   }
-  // [END product_search_get_similar_products_file]
+  // [END vision_product_search_get_similar_products]
 
   public static void main(String[] args) throws Exception {
     ProductSearch productSearch = new ProductSearch();