From 756443745bc5e305ff37229045391c7fd9c80297 Mon Sep 17 00:00:00 2001 From: shabirmean Date: Thu, 10 Nov 2022 15:18:40 -0500 Subject: [PATCH] cleanup: fix lint errors --- .../java/events/setup/EventsCreateBigQueryTable.java | 12 ++++++------ .../java/events/setup/RemoveEventsResources.java | 7 ++++++- .../src/main/java/product/ImportProductsGcs.java | 4 ++-- .../src/main/java/product/SetInventory.java | 6 +++++- .../product/setup/ProductsCreateBigqueryTable.java | 12 ++++++------ .../test/java/events/ImportUserEventsGcsTest.java | 8 ++++---- .../test/java/events/ImportUserEventsInlineTest.java | 4 ++-- .../src/test/java/events/PurgeUserEventTest.java | 6 +++--- .../src/test/java/events/RejoinUserEventTest.java | 6 +++--- .../src/test/java/events/WriteUserEventTest.java | 6 +++--- .../test/java/product/AddFulfillmentPlacesTest.java | 6 +++--- .../src/test/java/product/CrudProductTest.java | 8 ++++---- .../src/test/java/product/DeleteProductTest.java | 2 +- .../src/test/java/product/GetProductTest.java | 2 +- .../src/test/java/product/ImportProductsGcsTest.java | 10 +++++----- .../java/product/ImportProductsInlineSourceTest.java | 4 ++-- .../java/product/RemoveFulfillmentPlacesTest.java | 6 +++--- .../src/test/java/product/SetInventoryTest.java | 6 +++--- .../src/test/java/product/UpdateProductTest.java | 6 +++--- .../src/test/java/search/SearchSimpleQueryTest.java | 6 +++--- .../test/java/search/SearchWithBoostSpecTest.java | 6 +++--- .../test/java/search/SearchWithFacetSpecTest.java | 6 +++--- .../test/java/search/SearchWithFilteringTest.java | 6 +++--- .../src/test/java/search/SearchWithOrderingTest.java | 6 +++--- .../test/java/search/SearchWithPaginationTest.java | 6 +++--- .../search/SearchWithQueryExpansionSpecTest.java | 6 +++--- 26 files changed, 86 insertions(+), 77 deletions(-) diff --git a/retail/interactive-tutorials/src/main/java/events/setup/EventsCreateBigQueryTable.java b/retail/interactive-tutorials/src/main/java/events/setup/EventsCreateBigQueryTable.java index 0c714d90399..f0cf45345ba 100644 --- a/retail/interactive-tutorials/src/main/java/events/setup/EventsCreateBigQueryTable.java +++ b/retail/interactive-tutorials/src/main/java/events/setup/EventsCreateBigQueryTable.java @@ -32,14 +32,14 @@ public class EventsCreateBigQueryTable { public static void main(String[] args) throws IOException { - String dataset = "user_events"; - String validEventsTable = "events"; - String invalidEventsTable = "events_some_invalid"; - String eventsSchemaFilePath = "src/main/resources/events_schema.json"; + final String dataset = "user_events"; + final String validEventsTable = "events"; + final String invalidEventsTable = "events_some_invalid"; + final String eventsSchemaFilePath = "src/main/resources/events_schema.json"; // user_events.json and user_events_some_invalid.json are located in the resources folder - String validEventsSourceFile = + final String validEventsSourceFile = ProductsCreateBigqueryTable.class.getResource("/user_events.json").getPath(); - String invalidEventsSourceFile = + final String invalidEventsSourceFile = ProductsCreateBigqueryTable.class.getResource("/user_events_some_invalid.json").getPath(); BufferedReader bufferedReader = new BufferedReader(new FileReader(eventsSchemaFilePath)); diff --git a/retail/interactive-tutorials/src/main/java/events/setup/RemoveEventsResources.java b/retail/interactive-tutorials/src/main/java/events/setup/RemoveEventsResources.java index 05b19e33937..de6d43a2091 100644 --- a/retail/interactive-tutorials/src/main/java/events/setup/RemoveEventsResources.java +++ b/retail/interactive-tutorials/src/main/java/events/setup/RemoveEventsResources.java @@ -21,8 +21,13 @@ import com.google.api.gax.rpc.PermissionDeniedException; import com.google.cloud.ServiceOptions; -import com.google.cloud.retail.v2.*; +import com.google.cloud.retail.v2.DeleteProductRequest; +import com.google.cloud.retail.v2.ListProductsRequest; +import com.google.cloud.retail.v2.Product; +import com.google.cloud.retail.v2.ProductServiceClient; import com.google.cloud.retail.v2.ProductServiceClient.ListProductsPagedResponse; +import com.google.cloud.retail.v2.PurgeUserEventsRequest; +import com.google.cloud.retail.v2.UserEventServiceClient; import java.io.IOException; public class RemoveEventsResources { diff --git a/retail/interactive-tutorials/src/main/java/product/ImportProductsGcs.java b/retail/interactive-tutorials/src/main/java/product/ImportProductsGcs.java index 1ae9502a53f..fa9c42b5c13 100644 --- a/retail/interactive-tutorials/src/main/java/product/ImportProductsGcs.java +++ b/retail/interactive-tutorials/src/main/java/product/ImportProductsGcs.java @@ -51,8 +51,8 @@ public static void main(String[] args) throws IOException, InterruptedException String gcsErrorBucket = String.format("%s/errors", gcsBucket); // To check error handling, use an invalid catalog in request - // branchName = - // String.format("projects/%s/locations/global/catalogs/invalid_catalog/branches/default_branch", projectId); + // branchName = String.format( + // "projects/%s/locations/global/catalogs/invalid_catalog/branches/default_branch", projectId); String gcsProductsObject = "products.json"; // To check error handling, use an invalid product JSON. diff --git a/retail/interactive-tutorials/src/main/java/product/SetInventory.java b/retail/interactive-tutorials/src/main/java/product/SetInventory.java index 583df6b0982..5a5f1441037 100644 --- a/retail/interactive-tutorials/src/main/java/product/SetInventory.java +++ b/retail/interactive-tutorials/src/main/java/product/SetInventory.java @@ -21,8 +21,12 @@ import static setup.SetupCleanup.getProduct; import com.google.cloud.ServiceOptions; -import com.google.cloud.retail.v2.*; +import com.google.cloud.retail.v2.FulfillmentInfo; +import com.google.cloud.retail.v2.PriceInfo; +import com.google.cloud.retail.v2.Product; import com.google.cloud.retail.v2.Product.Availability; +import com.google.cloud.retail.v2.ProductServiceClient; +import com.google.cloud.retail.v2.SetInventoryRequest; import com.google.protobuf.FieldMask; import com.google.protobuf.Int32Value; import java.io.IOException; diff --git a/retail/interactive-tutorials/src/main/java/product/setup/ProductsCreateBigqueryTable.java b/retail/interactive-tutorials/src/main/java/product/setup/ProductsCreateBigqueryTable.java index 2463622af20..3638b6c79ac 100644 --- a/retail/interactive-tutorials/src/main/java/product/setup/ProductsCreateBigqueryTable.java +++ b/retail/interactive-tutorials/src/main/java/product/setup/ProductsCreateBigqueryTable.java @@ -31,13 +31,13 @@ public class ProductsCreateBigqueryTable { public static void main(String[] args) throws IOException { - String dataset = "products"; - String validProductsTable = "products"; - String invalidProductsTable = "products_some_invalid"; - String productSchemaFilePath = "src/main/resources/product_schema.json"; - String validProductsSourceFile = + final String dataset = "products"; + final String validProductsTable = "products"; + final String invalidProductsTable = "products_some_invalid"; + final String productSchemaFilePath = "src/main/resources/product_schema.json"; + final String validProductsSourceFile = ProductsCreateBigqueryTable.class.getResource("/products.json").getPath(); - String invalidProductsSourceFile = + final String invalidProductsSourceFile = ProductsCreateBigqueryTable.class.getResource("/products_some_invalid.json").getPath(); BufferedReader bufferedReader = new BufferedReader(new FileReader(productSchemaFilePath)); diff --git a/retail/interactive-tutorials/src/test/java/events/ImportUserEventsGcsTest.java b/retail/interactive-tutorials/src/test/java/events/ImportUserEventsGcsTest.java index 8ee3488f9f9..1829aab0a58 100644 --- a/retail/interactive-tutorials/src/test/java/events/ImportUserEventsGcsTest.java +++ b/retail/interactive-tutorials/src/test/java/events/ImportUserEventsGcsTest.java @@ -40,11 +40,11 @@ public class ImportUserEventsGcsTest { public void setUp() throws IOException, InterruptedException { EventsCreateGcsBucket.main(); - String projectId = ServiceOptions.getDefaultProjectId(); - String defaultCatalog = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String defaultCatalog = String.format("projects/%s/locations/global/catalogs/default_catalog", projectId); - String bucketName = EventsCreateGcsBucket.getBucketName(); - String gcsEventsObject = "user_events.json"; + final String bucketName = EventsCreateGcsBucket.getBucketName(); + final String gcsEventsObject = "user_events.json"; bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/events/ImportUserEventsInlineTest.java b/retail/interactive-tutorials/src/test/java/events/ImportUserEventsInlineTest.java index f182a5ad277..d7a213f72f1 100644 --- a/retail/interactive-tutorials/src/test/java/events/ImportUserEventsInlineTest.java +++ b/retail/interactive-tutorials/src/test/java/events/ImportUserEventsInlineTest.java @@ -37,8 +37,8 @@ public class ImportUserEventsInlineTest { @Before public void setUp() throws IOException, ExecutionException, InterruptedException { - String projectId = ServiceOptions.getDefaultProjectId(); - String defaultCatalog = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String defaultCatalog = String.format("projects/%s/locations/global/catalogs/default_catalog", projectId); bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); diff --git a/retail/interactive-tutorials/src/test/java/events/PurgeUserEventTest.java b/retail/interactive-tutorials/src/test/java/events/PurgeUserEventTest.java index 13e6897021e..6108662243a 100644 --- a/retail/interactive-tutorials/src/test/java/events/PurgeUserEventTest.java +++ b/retail/interactive-tutorials/src/test/java/events/PurgeUserEventTest.java @@ -38,10 +38,10 @@ public class PurgeUserEventTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String defaultCatalog = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String defaultCatalog = String.format("projects/%s/locations/global/catalogs/default_catalog", projectId); - String visitorId = UUID.randomUUID().toString(); + final String visitorId = UUID.randomUUID().toString(); bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/events/RejoinUserEventTest.java b/retail/interactive-tutorials/src/test/java/events/RejoinUserEventTest.java index 446ab2d9633..2d2f6f34a77 100644 --- a/retail/interactive-tutorials/src/test/java/events/RejoinUserEventTest.java +++ b/retail/interactive-tutorials/src/test/java/events/RejoinUserEventTest.java @@ -38,10 +38,10 @@ public class RejoinUserEventTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String defaultCatalog = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String defaultCatalog = String.format("projects/%s/locations/global/catalogs/default_catalog", projectId); - String visitorId = UUID.randomUUID().toString(); + final String visitorId = UUID.randomUUID().toString(); bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/events/WriteUserEventTest.java b/retail/interactive-tutorials/src/test/java/events/WriteUserEventTest.java index 46f5a652c90..2b842e9fc2e 100644 --- a/retail/interactive-tutorials/src/test/java/events/WriteUserEventTest.java +++ b/retail/interactive-tutorials/src/test/java/events/WriteUserEventTest.java @@ -38,10 +38,10 @@ public class WriteUserEventTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String defaultCatalog = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String defaultCatalog = String.format("projects/%s/locations/global/catalogs/default_catalog", projectId); - String visitorId = UUID.randomUUID().toString(); + final String visitorId = UUID.randomUUID().toString(); bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/product/AddFulfillmentPlacesTest.java b/retail/interactive-tutorials/src/test/java/product/AddFulfillmentPlacesTest.java index c80d7d65c1d..38c7824004f 100644 --- a/retail/interactive-tutorials/src/test/java/product/AddFulfillmentPlacesTest.java +++ b/retail/interactive-tutorials/src/test/java/product/AddFulfillmentPlacesTest.java @@ -43,9 +43,9 @@ public class AddFulfillmentPlacesTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { // TODO(developer): Replace these variables before running the sample. - String projectId = ServiceOptions.getDefaultProjectId(); - String generatedProductId = UUID.randomUUID().toString(); - String productName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String generatedProductId = UUID.randomUUID().toString(); + final String productName = String.format( "projects/%s/locations/global/catalogs/default_catalog/branches/0/products/%s", projectId, generatedProductId); diff --git a/retail/interactive-tutorials/src/test/java/product/CrudProductTest.java b/retail/interactive-tutorials/src/test/java/product/CrudProductTest.java index 40e0c3bb14f..459f58ff6de 100644 --- a/retail/interactive-tutorials/src/test/java/product/CrudProductTest.java +++ b/retail/interactive-tutorials/src/test/java/product/CrudProductTest.java @@ -43,12 +43,12 @@ public class CrudProductTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String generatedProductId = UUID.randomUUID().toString(); - String branchName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String generatedProductId = UUID.randomUUID().toString(); + final String branchName = String.format( "projects/%s/locations/global/catalogs/default_catalog/branches/0", projectId); - String productName = String.format("%s/products/%s", branchName, generatedProductId); + final String productName = String.format("%s/products/%s", branchName, generatedProductId); bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/product/DeleteProductTest.java b/retail/interactive-tutorials/src/test/java/product/DeleteProductTest.java index e4c0d4aba07..3ad0a5ba679 100644 --- a/retail/interactive-tutorials/src/test/java/product/DeleteProductTest.java +++ b/retail/interactive-tutorials/src/test/java/product/DeleteProductTest.java @@ -39,7 +39,7 @@ public class DeleteProductTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String generatedProductId = UUID.randomUUID().toString(); + final String generatedProductId = UUID.randomUUID().toString(); bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/product/GetProductTest.java b/retail/interactive-tutorials/src/test/java/product/GetProductTest.java index 6961ae68a0b..c1a48e01033 100644 --- a/retail/interactive-tutorials/src/test/java/product/GetProductTest.java +++ b/retail/interactive-tutorials/src/test/java/product/GetProductTest.java @@ -41,7 +41,7 @@ public class GetProductTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String generatedProductId = UUID.randomUUID().toString(); + final String generatedProductId = UUID.randomUUID().toString(); bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/product/ImportProductsGcsTest.java b/retail/interactive-tutorials/src/test/java/product/ImportProductsGcsTest.java index 22594f6bd89..e2440695589 100644 --- a/retail/interactive-tutorials/src/test/java/product/ImportProductsGcsTest.java +++ b/retail/interactive-tutorials/src/test/java/product/ImportProductsGcsTest.java @@ -40,13 +40,13 @@ public class ImportProductsGcsTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { ProductsCreateGcsBucket.main(); - String projectId = ServiceOptions.getDefaultProjectId(); - String branchName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String branchName = String.format( "projects/%s/locations/global/catalogs/default_catalog/branches/0", projectId); - String bucketName = ProductsCreateGcsBucket.getBucketName(); - String gcsBucket = String.format("gs://%s", bucketName); - String gscProductsObject = "products.json"; + final String bucketName = ProductsCreateGcsBucket.getBucketName(); + final String gcsBucket = String.format("gs://%s", bucketName); + final String gscProductsObject = "products.json"; bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/product/ImportProductsInlineSourceTest.java b/retail/interactive-tutorials/src/test/java/product/ImportProductsInlineSourceTest.java index b5a424dcfb7..7907e8d2ab8 100644 --- a/retail/interactive-tutorials/src/test/java/product/ImportProductsInlineSourceTest.java +++ b/retail/interactive-tutorials/src/test/java/product/ImportProductsInlineSourceTest.java @@ -38,8 +38,8 @@ public class ImportProductsInlineSourceTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String branchName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String branchName = String.format( "projects/%s/locations/global/catalogs/default_catalog/branches/0", projectId); bout = new ByteArrayOutputStream(); diff --git a/retail/interactive-tutorials/src/test/java/product/RemoveFulfillmentPlacesTest.java b/retail/interactive-tutorials/src/test/java/product/RemoveFulfillmentPlacesTest.java index fd4d041ed59..b729d5eb937 100644 --- a/retail/interactive-tutorials/src/test/java/product/RemoveFulfillmentPlacesTest.java +++ b/retail/interactive-tutorials/src/test/java/product/RemoveFulfillmentPlacesTest.java @@ -42,9 +42,9 @@ public class RemoveFulfillmentPlacesTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String generatedProductId = UUID.randomUUID().toString(); - String productName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String generatedProductId = UUID.randomUUID().toString(); + final String productName = String.format( "projects/%s/locations/global/catalogs/default_catalog/branches/0/products/%s", projectId, generatedProductId); diff --git a/retail/interactive-tutorials/src/test/java/product/SetInventoryTest.java b/retail/interactive-tutorials/src/test/java/product/SetInventoryTest.java index 12d0f716086..fdd1a685541 100644 --- a/retail/interactive-tutorials/src/test/java/product/SetInventoryTest.java +++ b/retail/interactive-tutorials/src/test/java/product/SetInventoryTest.java @@ -42,9 +42,9 @@ public class SetInventoryTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String generatedProductId = UUID.randomUUID().toString(); - String productName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String generatedProductId = UUID.randomUUID().toString(); + final String productName = String.format( "projects/%s/locations/global/catalogs/default_catalog/branches/0/products/%s", projectId, generatedProductId); diff --git a/retail/interactive-tutorials/src/test/java/product/UpdateProductTest.java b/retail/interactive-tutorials/src/test/java/product/UpdateProductTest.java index 78756acf8a4..60e99a59d6c 100644 --- a/retail/interactive-tutorials/src/test/java/product/UpdateProductTest.java +++ b/retail/interactive-tutorials/src/test/java/product/UpdateProductTest.java @@ -42,11 +42,11 @@ public class UpdateProductTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String branchName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String branchName = String.format( "projects/%s/locations/global/catalogs/default_catalog/branches/0", projectId); - String generatedProductId = UUID.randomUUID().toString(); + final String generatedProductId = UUID.randomUUID().toString(); bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/search/SearchSimpleQueryTest.java b/retail/interactive-tutorials/src/test/java/search/SearchSimpleQueryTest.java index a5e8f118077..bbf6f6b78f5 100644 --- a/retail/interactive-tutorials/src/test/java/search/SearchSimpleQueryTest.java +++ b/retail/interactive-tutorials/src/test/java/search/SearchSimpleQueryTest.java @@ -38,10 +38,10 @@ public class SearchSimpleQueryTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String defaultCatalogName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String defaultCatalogName = String.format("projects/%s/locations/global/catalogs/default_catalog", projectId); - String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; + final String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/search/SearchWithBoostSpecTest.java b/retail/interactive-tutorials/src/test/java/search/SearchWithBoostSpecTest.java index aa93dd83843..8d6bb221070 100644 --- a/retail/interactive-tutorials/src/test/java/search/SearchWithBoostSpecTest.java +++ b/retail/interactive-tutorials/src/test/java/search/SearchWithBoostSpecTest.java @@ -37,10 +37,10 @@ public class SearchWithBoostSpecTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String defaultCatalogName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String defaultCatalogName = String.format("projects/%s/locations/global/catalogs/default_catalog", projectId); - String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; + final String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/search/SearchWithFacetSpecTest.java b/retail/interactive-tutorials/src/test/java/search/SearchWithFacetSpecTest.java index 9b7a8c4d80c..2f5e14112fc 100644 --- a/retail/interactive-tutorials/src/test/java/search/SearchWithFacetSpecTest.java +++ b/retail/interactive-tutorials/src/test/java/search/SearchWithFacetSpecTest.java @@ -37,10 +37,10 @@ public class SearchWithFacetSpecTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String defaultCatalogName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String defaultCatalogName = String.format("projects/%s/locations/global/catalogs/default_catalog", projectId); - String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; + final String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/search/SearchWithFilteringTest.java b/retail/interactive-tutorials/src/test/java/search/SearchWithFilteringTest.java index 25550258005..0f91119dc56 100644 --- a/retail/interactive-tutorials/src/test/java/search/SearchWithFilteringTest.java +++ b/retail/interactive-tutorials/src/test/java/search/SearchWithFilteringTest.java @@ -38,10 +38,10 @@ public class SearchWithFilteringTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String defaultCatalogName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String defaultCatalogName = String.format("projects/%s/locations/global/catalogs/default_catalog", projectId); - String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; + final String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/search/SearchWithOrderingTest.java b/retail/interactive-tutorials/src/test/java/search/SearchWithOrderingTest.java index 7a597745f32..ef7729244a2 100644 --- a/retail/interactive-tutorials/src/test/java/search/SearchWithOrderingTest.java +++ b/retail/interactive-tutorials/src/test/java/search/SearchWithOrderingTest.java @@ -38,10 +38,10 @@ public class SearchWithOrderingTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String defaultCatalogName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String defaultCatalogName = String.format("projects/%s/locations/global/catalogs/default_catalog", projectId); - String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; + final String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/search/SearchWithPaginationTest.java b/retail/interactive-tutorials/src/test/java/search/SearchWithPaginationTest.java index 1c9de65336b..92673441d78 100644 --- a/retail/interactive-tutorials/src/test/java/search/SearchWithPaginationTest.java +++ b/retail/interactive-tutorials/src/test/java/search/SearchWithPaginationTest.java @@ -38,10 +38,10 @@ public class SearchWithPaginationTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String defaultCatalogName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String defaultCatalogName = String.format("projects/%s/locations/global/catalogs/default_catalog", projectId); - String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; + final String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out; diff --git a/retail/interactive-tutorials/src/test/java/search/SearchWithQueryExpansionSpecTest.java b/retail/interactive-tutorials/src/test/java/search/SearchWithQueryExpansionSpecTest.java index 492ca77535a..b4516c255dd 100644 --- a/retail/interactive-tutorials/src/test/java/search/SearchWithQueryExpansionSpecTest.java +++ b/retail/interactive-tutorials/src/test/java/search/SearchWithQueryExpansionSpecTest.java @@ -38,10 +38,10 @@ public class SearchWithQueryExpansionSpecTest { @Before public void setUp() throws IOException, InterruptedException, ExecutionException { - String projectId = ServiceOptions.getDefaultProjectId(); - String defaultCatalogName = + final String projectId = ServiceOptions.getDefaultProjectId(); + final String defaultCatalogName = String.format("projects/%s/locations/global/catalogs/default_catalog", projectId); - String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; + final String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search"; bout = new ByteArrayOutputStream(); PrintStream out = new PrintStream(bout); originalPrintStream = System.out;