Skip to content

Commit

Permalink
docs(samples): Refactoring search package (#415)
Browse files Browse the repository at this point in the history 
* Update README

* the bash scripts are added

* Update README.md

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* Update user_environment_setup.sh

* Update user_import_data_to_catalog.sh

* Update README.md

* Refactoring search package.

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: tetiana-karasova <tetiana.karasova@gmail.com>
Co-authored-by: t-karasova <tkarasova@google.com>
Co-authored-by: t-karasova <91195610+t-karasova@users.noreply.github.com>
Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Karl Weinmeister <11586922+kweinmeister@users.noreply.github.com>
  • Loading branch information
@sborisenkox @tetiana-karasova
@t-karasova @gcf-owl-bot @kweinmeister
6 people authored Jul 11, 2022
1 parent 2ce7d8e commit f7e3b16
Show file tree
Hide file tree
Showing 14 changed files with 77 additions and 56 deletions.
12 changes: 6 additions & 6 deletions java-retail/samples/interactive-tutorials/src/main/java/search/SearchSimpleQuery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,15 @@
public class SearchSimpleQuery {

public static void main(String[] args) throws IOException {
// TODO(developer): Replace these variables before running the sample.
String projectId = ServiceOptions.getDefaultProjectId();
String defaultCatalogName =
String.format("projects/%s/locations/global/catalogs/default_catalog", projectId);
String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search";

getSearchResponse(defaultSearchPlacementName);
searchResponse(defaultSearchPlacementName);
}

public static SearchResponse getSearchResponse(String defaultSearchPlacementName)
throws IOException {
public static void searchResponse(String defaultSearchPlacementName) throws IOException {
// TRY DIFFERENT QUERY PHRASES HERE:
String queryPhrase = "Hoodie";
String visitorId = UUID.randomUUID().toString();
Expand All @@ -58,11 +56,13 @@ public static SearchResponse getSearchResponse(String defaultSearchPlacementName
.build();
System.out.println("Search request: " + searchRequest);

// 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 (SearchServiceClient client = SearchServiceClient.create()) {
SearchResponse searchResponse = client.search(searchRequest).getPage().getResponse();
System.out.println("Search response: " + searchResponse);

return searchResponse;
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions java-retail/samples/interactive-tutorials/src/main/java/search/SearchWithBoostSpec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,15 @@
public class SearchWithBoostSpec {

public static void main(String[] args) throws IOException {
// TODO(developer): Replace these variables before running the sample.
String projectId = ServiceOptions.getDefaultProjectId();
String defaultCatalogName =
String.format("projects/%s/locations/global/catalogs/default_catalog", projectId);
String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search";

getSearchResponse(defaultSearchPlacementName);
searchResponse(defaultSearchPlacementName);
}

public static SearchResponse getSearchResponse(String defaultSearchPlacementName)
throws IOException {
public static void searchResponse(String defaultSearchPlacementName) throws IOException {
// TRY DIFFERENT CONDITIONS HERE:
String searchQuery = "Tee";
String condition = "(colorFamilies: ANY(\"Blue\"))";
Expand All @@ -69,11 +67,13 @@ public static SearchResponse getSearchResponse(String defaultSearchPlacementName
.build();
System.out.println("Search request: " + searchRequest);

// 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 (SearchServiceClient client = SearchServiceClient.create()) {
SearchResponse searchResponse = client.search(searchRequest).getPage().getResponse();
System.out.println("Search response: " + searchResponse);

return searchResponse;
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions java-retail/samples/interactive-tutorials/src/main/java/search/SearchWithFacetSpec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,15 @@
public class SearchWithFacetSpec {

public static void main(String[] args) throws IOException {
// TODO(developer): Replace these variables before running the sample.
String projectId = ServiceOptions.getDefaultProjectId();
String defaultCatalogName =
String.format("projects/%s/locations/global/catalogs/default_catalog", projectId);
String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search";

getSearchResponse(defaultSearchPlacementName);
searchResponse(defaultSearchPlacementName);
}

public static SearchResponse getSearchResponse(String defaultSearchPlacementName)
throws IOException {
public static void searchResponse(String defaultSearchPlacementName) throws IOException {
// TRY DIFFERENT CONDITIONS HERE:
String searchQuery = "Tee";
String facetKeyParam = "colorFamilies";
Expand All @@ -60,11 +58,13 @@ public static SearchResponse getSearchResponse(String defaultSearchPlacementName
.build();
System.out.println("Search request: " + searchRequest);

// 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 (SearchServiceClient client = SearchServiceClient.create()) {
SearchResponse searchResponse = client.search(searchRequest).getPage().getResponse();
System.out.println("Search response: " + searchResponse);

return searchResponse;
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions java-retail/samples/interactive-tutorials/src/main/java/search/SearchWithFiltering.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,15 @@
public class SearchWithFiltering {

public static void main(String[] args) throws IOException {
// TODO(developer): Replace these variables before running the sample.
String projectId = ServiceOptions.getDefaultProjectId();
String defaultCatalogName =
String.format("projects/%s/locations/global/catalogs/default_catalog", projectId);
String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search";

getSearchResponse(defaultSearchPlacementName);
searchResponse(defaultSearchPlacementName);
}

public static SearchResponse getSearchResponse(String defaultSearchPlacementName)
throws IOException {
public static void searchResponse(String defaultSearchPlacementName) throws IOException {
// TRY DIFFERENT FILTER EXPRESSIONS HERE:
String filter = "(colorFamilies: ANY(\"Black\"))";
String queryPhrase = "Tee";
Expand All @@ -61,11 +59,13 @@ public static SearchResponse getSearchResponse(String defaultSearchPlacementName

System.out.println("Search request: " + searchRequest);

// 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 (SearchServiceClient client = SearchServiceClient.create()) {
SearchResponse searchResponse = client.search(searchRequest).getPage().getResponse();
System.out.println("Search response: " + searchResponse);

return searchResponse;
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions java-retail/samples/interactive-tutorials/src/main/java/search/SearchWithOrdering.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,15 @@
public class SearchWithOrdering {

public static void main(String[] args) throws IOException {
// TODO(developer): Replace these variables before running the sample.
String projectId = ServiceOptions.getDefaultProjectId();
String defaultCatalogName =
String.format("projects/%s/locations/global/catalogs/default_catalog", projectId);
String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search";

getSearchResponse(defaultSearchPlacementName);
searchResponse(defaultSearchPlacementName);
}

public static SearchResponse getSearchResponse(String defaultSearchPlacementName)
throws IOException {
public static void searchResponse(String defaultSearchPlacementName) throws IOException {
// TRY DIFFERENT ORDER BY EXPRESSION HERE:
String order = "price desc";
String queryPhrase = "Hoodie";
Expand All @@ -60,11 +58,13 @@ public static SearchResponse getSearchResponse(String defaultSearchPlacementName
.build();
System.out.println("Search request: " + searchRequest);

// 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 (SearchServiceClient client = SearchServiceClient.create()) {
SearchResponse searchResponse = client.search(searchRequest).getPage().getResponse();
System.out.println("Search response: " + searchResponse);

return searchResponse;
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions java-retail/samples/interactive-tutorials/src/main/java/search/SearchWithPagination.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,15 @@
public class SearchWithPagination {

public static void main(String[] args) throws IOException {
// TODO(developer): Replace these variables before running the sample.
String projectId = ServiceOptions.getDefaultProjectId();
String defaultCatalogName =
String.format("projects/%s/locations/global/catalogs/default_catalog", projectId);
String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search";

getSearchResponse(defaultSearchPlacementName);
searchResponse(defaultSearchPlacementName);
}

public static SearchResponse getSearchResponse(String defaultSearchPlacementName)
throws IOException {
public static void searchResponse(String defaultSearchPlacementName) throws IOException {
// TRY DIFFERENT PAGINATION PARAMETERS HERE:
int pageSize = 6;
String queryPhrase = "Hoodie";
Expand All @@ -63,15 +61,17 @@ public static SearchResponse getSearchResponse(String defaultSearchPlacementName
.build();
System.out.println("Search request: " + searchRequest);

// 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 (SearchServiceClient client = SearchServiceClient.create()) {
SearchResponse searchResponseFirstPage = client.search(searchRequest).getPage().getResponse();
System.out.println("Search response: " + searchResponseFirstPage);

// PASTE CALL WITH NEXT PAGE TOKEN HERE:

// PASTE CALL WITH OFFSET HERE:

return searchResponseFirstPage;
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions ...tail/samples/interactive-tutorials/src/main/java/search/SearchWithQueryExpansionSpec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,15 @@
public class SearchWithQueryExpansionSpec {

public static void main(String[] args) throws IOException {
// TODO(developer): Replace these variables before running the sample.
String projectId = ServiceOptions.getDefaultProjectId();
String defaultCatalogName =
String.format("projects/%s/locations/global/catalogs/default_catalog", projectId);
String defaultSearchPlacementName = defaultCatalogName + "/placements/default_search";

getSearchResponse(defaultSearchPlacementName);
searchResponse(defaultSearchPlacementName);
}

public static SearchResponse getSearchResponse(String defaultSearchPlacementName)
throws IOException {
public static void searchResponse(String defaultSearchPlacementName) throws IOException {
// TRY DIFFERENT QUERY EXPANSION CONDITION HERE:
Condition condition = Condition.AUTO;
int pageSize = 10;
Expand All @@ -66,11 +64,13 @@ public static SearchResponse getSearchResponse(String defaultSearchPlacementName
.build();
System.out.println("Search request: " + searchRequest);

// 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 (SearchServiceClient client = SearchServiceClient.create()) {
SearchResponse searchResponse = client.search(searchRequest).getPage().getResponse();
System.out.println("Search response: " + searchResponse);

return searchResponse;
}
}
}
Expand Down
7 changes: 5 additions & 2 deletions java-retail/samples/interactive-tutorials/src/test/java/search/SearchSimpleQueryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package search;

import static com.google.common.truth.Truth.assertThat;
import static search.SearchSimpleQuery.getSearchResponse;
import static search.SearchSimpleQuery.searchResponse;

import com.google.cloud.ServiceOptions;
import java.io.ByteArrayOutputStream;
Expand All @@ -27,7 +27,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public class SearchSimpleQueryTest {

private ByteArrayOutputStream bout;
Expand All @@ -44,7 +47,7 @@ public void setUp() throws IOException, InterruptedException, ExecutionException
originalPrintStream = System.out;
System.setOut(out);

getSearchResponse(defaultSearchPlacementName);
searchResponse(defaultSearchPlacementName);
}

@Test
Expand Down
7 changes: 5 additions & 2 deletions java-retail/samples/interactive-tutorials/src/test/java/search/SearchWithBoostSpecTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package search;

import static com.google.common.truth.Truth.assertThat;
import static search.SearchWithBoostSpec.getSearchResponse;
import static search.SearchWithBoostSpec.searchResponse;

import com.google.cloud.ServiceOptions;
import java.io.ByteArrayOutputStream;
Expand All @@ -27,7 +27,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public class SearchWithBoostSpecTest {
private ByteArrayOutputStream bout;
private PrintStream originalPrintStream;
Expand All @@ -43,7 +46,7 @@ public void setUp() throws IOException, InterruptedException, ExecutionException
originalPrintStream = System.out;
System.setOut(out);

getSearchResponse(defaultSearchPlacementName);
searchResponse(defaultSearchPlacementName);
}

@Test
Expand Down
7 changes: 5 additions & 2 deletions java-retail/samples/interactive-tutorials/src/test/java/search/SearchWithFacetSpecTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package search;

import static com.google.common.truth.Truth.assertThat;
import static search.SearchWithFacetSpec.getSearchResponse;
import static search.SearchWithFacetSpec.searchResponse;

import com.google.cloud.ServiceOptions;
import java.io.ByteArrayOutputStream;
Expand All @@ -27,7 +27,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public class SearchWithFacetSpecTest {
private ByteArrayOutputStream bout;
private PrintStream originalPrintStream;
Expand All @@ -43,7 +46,7 @@ public void setUp() throws IOException, InterruptedException, ExecutionException
originalPrintStream = System.out;
System.setOut(out);

getSearchResponse(defaultSearchPlacementName);
searchResponse(defaultSearchPlacementName);
}

@Test
Expand Down
7 changes: 5 additions & 2 deletions java-retail/samples/interactive-tutorials/src/test/java/search/SearchWithFilteringTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package search;

import static com.google.common.truth.Truth.assertThat;
import static search.SearchSimpleQuery.getSearchResponse;
import static search.SearchWithFiltering.searchResponse;

import com.google.cloud.ServiceOptions;
import java.io.ByteArrayOutputStream;
Expand All @@ -27,7 +27,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public class SearchWithFilteringTest {

private ByteArrayOutputStream bout;
Expand All @@ -44,7 +47,7 @@ public void setUp() throws IOException, InterruptedException, ExecutionException
originalPrintStream = System.out;
System.setOut(out);

getSearchResponse(defaultSearchPlacementName);
searchResponse(defaultSearchPlacementName);
}

@Test
Expand Down
Loading

0 comments on commit f7e3b16

Please sign in to comment.