Skip to content

Commit 04a446d

Browse files
averikitschlesv
authored and
chingor13
committed
samples: update shared config (#2443)
* update shared config * Update to 1.0.13 * lint * Fix linting * lint * fix imports Co-authored-by: Les Vogel <[email protected]>
1 parent ec0f0c6 commit 04a446d

16 files changed

+37
-73
lines changed

‎vision/snippets/src/main/java/com/example/vision/ImportProductSets.java

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
// [END vision_product_search_tutorial_import]
2929
import java.io.PrintStream;
3030
import javax.swing.JPanel;
31-
3231
import net.sourceforge.argparse4j.ArgumentParsers;
3332
import net.sourceforge.argparse4j.inf.ArgumentParser;
3433
import net.sourceforge.argparse4j.inf.ArgumentParserException;

‎vision/snippets/src/main/java/com/example/vision/ProductInProductSetManagement.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
import com.google.cloud.vision.v1.Product;
2020
import com.google.cloud.vision.v1.ProductName;
2121
import com.google.cloud.vision.v1.ProductSearchClient;
22-
2322
import java.io.IOException;
2423
import java.io.PrintStream;
25-
2624
import net.sourceforge.argparse4j.ArgumentParsers;
2725
import net.sourceforge.argparse4j.inf.ArgumentParser;
2826
import net.sourceforge.argparse4j.inf.ArgumentParserException;
@@ -172,7 +170,7 @@ public static void argsHelper(String[] args, PrintStream out) throws Exception {
172170
}
173171
if (ns.get("command").equals("remove_product_from_product_set")) {
174172
removeProductFromProductSet(
175-
projectId, computeRegion, ns.getString("productId"), ns.getString("productSetId"));
173+
projectId, computeRegion, ns.getString("productId"), ns.getString("productSetId"));
176174
}
177175

178176
} catch (ArgumentParserException e) {

‎vision/snippets/src/main/java/com/example/vision/ProductManagement.java

-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@
2020
import com.google.cloud.vision.v1.Product.KeyValue;
2121
import com.google.cloud.vision.v1.ProductSearchClient;
2222
import com.google.protobuf.FieldMask;
23-
2423
import java.io.IOException;
2524
import java.io.PrintStream;
26-
2725
import net.sourceforge.argparse4j.ArgumentParsers;
2826
import net.sourceforge.argparse4j.inf.ArgumentParser;
2927
import net.sourceforge.argparse4j.inf.ArgumentParserException;

‎vision/snippets/src/main/java/com/example/vision/ProductSearch.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@
2929
import com.google.cloud.vision.v1.ProductSearchResults.Result;
3030
import com.google.cloud.vision.v1.ProductSetName;
3131
import com.google.protobuf.ByteString;
32-
3332
import java.io.File;
3433
import java.io.IOException;
3534
import java.io.PrintStream;
3635
import java.nio.file.Files;
3736
import java.util.Arrays;
3837
import java.util.List;
39-
4038
import net.sourceforge.argparse4j.ArgumentParsers;
4139
import net.sourceforge.argparse4j.inf.ArgumentParser;
4240
import net.sourceforge.argparse4j.inf.ArgumentParserException;
@@ -48,10 +46,9 @@
4846
* This application demonstrates how to perform similar product search operation in Cloud Vision
4947
* Product Search.
5048
*
51-
* For more information, see the tutorial page at
49+
* <p>For more information, see the tutorial page at
5250
* https://cloud.google.com/vision/product-search/docs/
5351
*/
54-
5552
public class ProductSearch {
5653

5754
// [START vision_product_search_get_similar_products]

‎vision/snippets/src/main/java/com/example/vision/ProductSetManagement.java

-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
import com.google.cloud.vision.v1.CreateProductSetRequest;
2020
import com.google.cloud.vision.v1.ProductSearchClient;
2121
import com.google.cloud.vision.v1.ProductSet;
22-
2322
import java.io.IOException;
2423
import java.io.PrintStream;
25-
2624
import net.sourceforge.argparse4j.ArgumentParsers;
2725
import net.sourceforge.argparse4j.inf.ArgumentParser;
2826
import net.sourceforge.argparse4j.inf.ArgumentParserException;

‎vision/snippets/src/main/java/com/example/vision/ReferenceImageManagement.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,11 @@
1616

1717
package com.example.vision;
1818

19-
import com.google.cloud.vision.v1.Image;
2019
import com.google.cloud.vision.v1.ImageName;
2120
import com.google.cloud.vision.v1.ProductSearchClient;
2221
import com.google.cloud.vision.v1.ReferenceImage;
23-
2422
import java.io.IOException;
2523
import java.io.PrintStream;
26-
2724
import net.sourceforge.argparse4j.ArgumentParsers;
2825
import net.sourceforge.argparse4j.inf.ArgumentParser;
2926
import net.sourceforge.argparse4j.inf.ArgumentParserException;
@@ -125,8 +122,7 @@ public static void getReferenceImage(
125122

126123
// Get the full path of the reference image.
127124
String formattedName =
128-
ImageName.format(
129-
projectId, computeRegion, productId, referenceImageId);
125+
ImageName.format(projectId, computeRegion, productId, referenceImageId);
130126
// Get complete detail of the reference image.
131127
ReferenceImage image = client.getReferenceImage(formattedName);
132128
// Display the reference image information.
@@ -160,8 +156,7 @@ public static void deleteReferenceImage(
160156

161157
// Get the full path of the reference image.
162158
String formattedName =
163-
ImageName.format(
164-
projectId, computeRegion, productId, referenceImageId);
159+
ImageName.format(projectId, computeRegion, productId, referenceImageId);
165160
// Delete the reference image.
166161
client.deleteReferenceImage(formattedName);
167162
System.out.println("Reference image deleted from product.");

‎vision/snippets/src/main/java/com/example/vision/snippets/PurgeProducts.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@
2121
import com.google.cloud.vision.v1.LocationName;
2222
import com.google.cloud.vision.v1.ProductSearchClient;
2323
import com.google.cloud.vision.v1.PurgeProductsRequest;
24-
2524
import java.util.concurrent.TimeUnit;
2625

27-
2826
public class PurgeProducts {
2927

3028
// Delete the product and all its reference images.
31-
public static void purgeOrphanProducts(String projectId, String computeRegion)
32-
throws Exception {
29+
public static void purgeOrphanProducts(String projectId, String computeRegion) throws Exception {
3330

3431
// String projectId = "YOUR_PROJECT_ID";
3532
// String computeRegion = "us-central1";
@@ -39,8 +36,8 @@ public static void purgeOrphanProducts(String projectId, String computeRegion)
3936
String parent = LocationName.format(projectId, computeRegion);
4037

4138
// The purge operation is async.
42-
PurgeProductsRequest request = PurgeProductsRequest
43-
.newBuilder()
39+
PurgeProductsRequest request =
40+
PurgeProductsRequest.newBuilder()
4441
.setDeleteOrphanProducts(true)
4542
// The operation is irreversible and removes multiple products.
4643
// The user is required to pass in force=True to actually perform the
@@ -57,4 +54,4 @@ public static void purgeOrphanProducts(String projectId, String computeRegion)
5754
}
5855
}
5956
}
60-
// [END vision_product_search_purge_orphan_products]
57+
// [END vision_product_search_purge_orphan_products]

‎vision/snippets/src/main/java/com/example/vision/snippets/PurgeProductsInProductSet.java

+5-9
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,13 @@
2424
import com.google.cloud.vision.v1.ProductSetPurgeConfig;
2525
import com.google.cloud.vision.v1.PurgeProductsRequest;
2626
import com.google.protobuf.Empty;
27-
2827
import java.util.concurrent.TimeUnit;
2928

3029
public class PurgeProductsInProductSet {
3130

3231
// Delete all products in a product set.
3332
public static void purgeProductsInProductSet(
34-
String projectId, String location, String productSetId)
35-
throws Exception {
33+
String projectId, String location, String productSetId) throws Exception {
3634

3735
// String projectId = "YOUR_PROJECT_ID";
3836
// String location = "us-central1";
@@ -42,13 +40,11 @@ public static void purgeProductsInProductSet(
4240
try (ProductSearchClient client = ProductSearchClient.create()) {
4341

4442
String parent = LocationName.format(projectId, location);
45-
ProductSetPurgeConfig productSetPurgeConfig = ProductSetPurgeConfig
46-
.newBuilder()
47-
.setProductSetId(productSetId)
48-
.build();
43+
ProductSetPurgeConfig productSetPurgeConfig =
44+
ProductSetPurgeConfig.newBuilder().setProductSetId(productSetId).build();
4945

50-
PurgeProductsRequest request = PurgeProductsRequest
51-
.newBuilder()
46+
PurgeProductsRequest request =
47+
PurgeProductsRequest.newBuilder()
5248
.setParent(parent)
5349
.setProductSetPurgeConfig(productSetPurgeConfig)
5450
// The operation is irreversible and removes multiple products.

‎vision/snippets/src/test/java/com/example/vision/ImportProductSetsIT.java

-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@
2323
import com.google.cloud.storage.BlobInfo;
2424
import com.google.cloud.storage.Storage;
2525
import com.google.cloud.storage.StorageOptions;
26-
2726
import java.io.ByteArrayOutputStream;
2827
import java.io.IOException;
2928
import java.io.PrintStream;
3029
import java.util.UUID;
31-
3230
import org.junit.After;
3331
import org.junit.Before;
3432
import org.junit.Test;

‎vision/snippets/src/test/java/com/example/vision/ProductInProductSetManagementIT.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.io.IOException;
2323
import java.io.PrintStream;
2424
import java.util.UUID;
25-
2625
import org.junit.After;
2726
import org.junit.Before;
2827
import org.junit.Test;
@@ -36,11 +35,11 @@ public class ProductInProductSetManagementIT {
3635
private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
3736
private static final String COMPUTE_REGION = "us-west1";
3837
private static final String PRODUCT_SET_DISPLAY_NAME =
39-
String.format("test_%s", UUID.randomUUID().toString());
38+
String.format("test_%s", UUID.randomUUID().toString());
4039
private static final String PRODUCT_SET_ID =
41-
String.format("test_%s", UUID.randomUUID().toString());
40+
String.format("test_%s", UUID.randomUUID().toString());
4241
private static final String PRODUCT_DISPLAY_NAME =
43-
String.format("test_%s", UUID.randomUUID().toString());
42+
String.format("test_%s", UUID.randomUUID().toString());
4443
private static final String PRODUCT_CATEGORY = "apparel";
4544
private static final String PRODUCT_ID = String.format("test_%s", UUID.randomUUID().toString());
4645
private ByteArrayOutputStream bout;

‎vision/snippets/src/test/java/com/example/vision/ProductManagementIT.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.io.IOException;
2323
import java.io.PrintStream;
2424
import java.util.UUID;
25-
2625
import org.junit.After;
2726
import org.junit.Before;
2827
import org.junit.Test;
@@ -36,7 +35,7 @@ public class ProductManagementIT {
3635
private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
3736
private static final String COMPUTE_REGION = "us-west1";
3837
private static final String PRODUCT_DISPLAY_NAME =
39-
String.format("test_%s", UUID.randomUUID().toString());
38+
String.format("test_%s", UUID.randomUUID().toString());
4039
private static final String PRODUCT_CATEGORY = "homegoods";
4140
private static final String PRODUCT_ID = String.format("test_%s", UUID.randomUUID().toString());
4241
private static final String KEY = String.format("test_%s", UUID.randomUUID().toString());

‎vision/snippets/src/test/java/com/example/vision/ProductSearchIT.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,16 @@
2020

2121
import java.io.ByteArrayOutputStream;
2222
import java.io.PrintStream;
23-
import java.util.UUID;
24-
2523
import org.junit.After;
2624
import org.junit.Before;
2725
import org.junit.Test;
2826
import org.junit.runner.RunWith;
2927
import org.junit.runners.JUnit4;
3028

3129
/**
32-
* Integration (system) tests for {@link ProductSearch}.Tests rely on pre-created product set
33-
* that has been indexed.
34-
**/
30+
* Integration (system) tests for {@link ProductSearch}.Tests rely on pre-created product set that
31+
* has been indexed.
32+
*/
3533
@RunWith(JUnit4.class)
3634
@SuppressWarnings("checkstyle:abbreviationaswordinname")
3735
public class ProductSearchIT {

‎vision/snippets/src/test/java/com/example/vision/ProductSetManagementIT.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.io.ByteArrayOutputStream;
2222
import java.io.PrintStream;
2323
import java.util.UUID;
24-
2524
import org.junit.After;
2625
import org.junit.Before;
2726
import org.junit.Test;
@@ -35,9 +34,9 @@ public class ProductSetManagementIT {
3534
private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
3635
private static final String COMPUTE_REGION = "us-west1";
3736
private static final String PRODUCT_SET_ID =
38-
String.format("test_%s", UUID.randomUUID().toString());
37+
String.format("test_%s", UUID.randomUUID().toString());
3938
private static final String PRODUCT_SET_DISPLAY_NAME =
40-
String.format("test_%s", UUID.randomUUID().toString());
39+
String.format("test_%s", UUID.randomUUID().toString());
4140
private ByteArrayOutputStream bout;
4241
private PrintStream out;
4342

@@ -56,7 +55,7 @@ public void tearDown() {
5655
@Test
5756
public void testCreateDeleteProductSet() throws Exception {
5857
ProductSetManagement.createProductSet(
59-
PROJECT_ID, COMPUTE_REGION, PRODUCT_SET_ID, PRODUCT_SET_DISPLAY_NAME);
58+
PROJECT_ID, COMPUTE_REGION, PRODUCT_SET_ID, PRODUCT_SET_DISPLAY_NAME);
6059
String got = bout.toString();
6160
assertThat(got).contains(PRODUCT_SET_ID);
6261

‎vision/snippets/src/test/java/com/example/vision/ReferenceImageManagementIT.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.io.IOException;
2323
import java.io.PrintStream;
2424
import java.util.UUID;
25-
2625
import org.junit.After;
2726
import org.junit.Before;
2827
import org.junit.Test;
@@ -36,13 +35,12 @@ public class ReferenceImageManagementIT {
3635
private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
3736
private static final String COMPUTE_REGION = "us-west1";
3837
private static final String PRODUCT_DISPLAY_NAME =
39-
String.format("test_%s", UUID.randomUUID().toString());
38+
String.format("test_%s", UUID.randomUUID().toString());
4039
private static final String PRODUCT_CATEGORY = "apparel";
4140
private static final String PRODUCT_ID = String.format("test_%s", UUID.randomUUID().toString());
4241
private static final String REFERENCE_IMAGE_ID =
43-
String.format("test_%s", UUID.randomUUID().toString());
44-
private static final String GCS_URI =
45-
"gs://java-docs-samples-testing/product-search/shoes_1.jpg";
42+
String.format("test_%s", UUID.randomUUID().toString());
43+
private static final String GCS_URI = "gs://java-docs-samples-testing/product-search/shoes_1.jpg";
4644
private ByteArrayOutputStream bout;
4745
private PrintStream out;
4846

‎vision/snippets/src/test/java/vision/snippets/ProductInProductSetManagementTests.java

+9-13
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.io.IOException;
2727
import java.io.PrintStream;
2828
import java.util.UUID;
29-
3029
import org.junit.After;
3130
import org.junit.Before;
3231
import org.junit.Test;
@@ -35,11 +34,11 @@ public class ProductInProductSetManagementTests {
3534
private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
3635
private static final String COMPUTE_REGION = "us-west1";
3736
private static final String PRODUCT_SET_DISPLAY_NAME =
38-
String.format("test_%s", UUID.randomUUID().toString());
37+
String.format("test_%s", UUID.randomUUID().toString());
3938
private static final String PRODUCT_SET_ID =
40-
String.format("test_%s", UUID.randomUUID().toString());
39+
String.format("test_%s", UUID.randomUUID().toString());
4140
private static final String PRODUCT_DISPLAY_NAME =
42-
String.format("test_%s", UUID.randomUUID().toString());
41+
String.format("test_%s", UUID.randomUUID().toString());
4342
private static final String PRODUCT_CATEGORY = "apparel";
4443
private static final String PRODUCT_ID = String.format("test_%s", UUID.randomUUID().toString());
4544
private ByteArrayOutputStream bout;
@@ -51,9 +50,9 @@ public void setUp() throws IOException {
5150
out = new PrintStream(bout);
5251
System.setOut(out);
5352
ProductSetManagement.createProductSet(
54-
PROJECT_ID, COMPUTE_REGION, PRODUCT_SET_ID, PRODUCT_SET_DISPLAY_NAME);
53+
PROJECT_ID, COMPUTE_REGION, PRODUCT_SET_ID, PRODUCT_SET_DISPLAY_NAME);
5554
ProductManagement.createProduct(
56-
PROJECT_ID, COMPUTE_REGION, PRODUCT_ID, PRODUCT_DISPLAY_NAME, PRODUCT_CATEGORY);
55+
PROJECT_ID, COMPUTE_REGION, PRODUCT_ID, PRODUCT_DISPLAY_NAME, PRODUCT_CATEGORY);
5756
bout.reset();
5857
}
5958

@@ -68,20 +67,17 @@ public void tearDown() throws IOException {
6867
public void testPurgeProductsInProductSet() throws Exception {
6968
// Act
7069
ProductInProductSetManagement.addProductToProductSet(
71-
PROJECT_ID, COMPUTE_REGION, PRODUCT_ID, PRODUCT_SET_ID);
72-
ProductManagement.listProducts(
73-
PROJECT_ID, COMPUTE_REGION);
70+
PROJECT_ID, COMPUTE_REGION, PRODUCT_ID, PRODUCT_SET_ID);
71+
ProductManagement.listProducts(PROJECT_ID, COMPUTE_REGION);
7472

7573
// Assert
7674
String got = bout.toString();
7775
assertThat(got).contains(PRODUCT_ID);
7876

7977
bout.reset();
80-
PurgeProductsInProductSet.purgeProductsInProductSet(
81-
PROJECT_ID, COMPUTE_REGION, PRODUCT_SET_ID);
78+
PurgeProductsInProductSet.purgeProductsInProductSet(PROJECT_ID, COMPUTE_REGION, PRODUCT_SET_ID);
8279

83-
ProductManagement.listProducts(
84-
PROJECT_ID, COMPUTE_REGION);
80+
ProductManagement.listProducts(PROJECT_ID, COMPUTE_REGION);
8581

8682
// Assert
8783
got = bout.toString();

‎vision/snippets/src/test/java/vision/snippets/ProductManagementTests.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.io.IOException;
2525
import java.io.PrintStream;
2626
import java.util.UUID;
27-
2827
import org.junit.After;
2928
import org.junit.Before;
3029
import org.junit.Test;
@@ -37,7 +36,7 @@ public class ProductManagementTests {
3736
private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
3837
private static final String COMPUTE_REGION = "us-west1";
3938
private static final String PRODUCT_DISPLAY_NAME =
40-
String.format("test_%s", UUID.randomUUID().toString());
39+
String.format("test_%s", UUID.randomUUID().toString());
4140
private static final String PRODUCT_CATEGORY = "homegoods";
4241
private static final String PRODUCT_ID = String.format("test_%s", UUID.randomUUID().toString());
4342
private ByteArrayOutputStream bout;
@@ -60,7 +59,7 @@ public void tearDown() throws IOException {
6059
public void testPurgeOrphanProducts() throws Exception {
6160
// Act
6261
ProductManagement.createProduct(
63-
PROJECT_ID, COMPUTE_REGION, PRODUCT_ID, PRODUCT_DISPLAY_NAME, PRODUCT_CATEGORY);
62+
PROJECT_ID, COMPUTE_REGION, PRODUCT_ID, PRODUCT_DISPLAY_NAME, PRODUCT_CATEGORY);
6463
ProductManagement.listProducts(PROJECT_ID, COMPUTE_REGION);
6564

6665
// Assert

0 commit comments

Comments
 (0)