Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,14 @@ public class ProductSearchClient implements BackgroundResource {
private static final PathTemplate LOCATION_PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding("projects/{project}/locations/{location}");

private static final PathTemplate PRODUCT_SET_PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding(
"projects/{project}/locations/{location}/productSets/{product_set}");

private static final PathTemplate PRODUCT_PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding(
"projects/{project}/locations/{location}/products/{product}");

private static final PathTemplate PRODUCT_SET_PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding(
"projects/{project}/locations/{location}/productSets/{product_set}");

private static final PathTemplate REFERENCE_IMAGE_PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding(
"projects/{project}/locations/{location}/products/{product}/referenceImages/{reference_image}");
Expand All @@ -156,30 +156,30 @@ public static final String formatLocationName(String project, String location) {
}

/**
* Formats a string containing the fully-qualified path to represent a product_set resource.
* Formats a string containing the fully-qualified path to represent a product resource.
*
* @deprecated Use the {@link ProductSetName} class instead.
* @deprecated Use the {@link ProductName} class instead.
*/
@Deprecated
public static final String formatProductSetName(
String project, String location, String productSet) {
return PRODUCT_SET_PATH_TEMPLATE.instantiate(
public static final String formatProductName(String project, String location, String product) {
return PRODUCT_PATH_TEMPLATE.instantiate(
"project", project,
"location", location,
"product_set", productSet);
"product", product);
}

/**
* Formats a string containing the fully-qualified path to represent a product resource.
* Formats a string containing the fully-qualified path to represent a product_set resource.
*
* @deprecated Use the {@link ProductName} class instead.
* @deprecated Use the {@link ProductSetName} class instead.
*/
@Deprecated
public static final String formatProductName(String project, String location, String product) {
return PRODUCT_PATH_TEMPLATE.instantiate(
public static final String formatProductSetName(
String project, String location, String productSet) {
return PRODUCT_SET_PATH_TEMPLATE.instantiate(
"project", project,
"location", location,
"product", product);
"product_set", productSet);
}

/**
Expand Down Expand Up @@ -218,65 +218,65 @@ public static final String parseLocationFromLocationName(String locationName) {
}

/**
* Parses the project from the given fully-qualified path which represents a product_set resource.
* Parses the project from the given fully-qualified path which represents a product resource.
*
* @deprecated Use the {@link ProductSetName} class instead.
* @deprecated Use the {@link ProductName} class instead.
*/
@Deprecated
public static final String parseProjectFromProductSetName(String productSetName) {
return PRODUCT_SET_PATH_TEMPLATE.parse(productSetName).get("project");
public static final String parseProjectFromProductName(String productName) {
return PRODUCT_PATH_TEMPLATE.parse(productName).get("project");
}

/**
* Parses the location from the given fully-qualified path which represents a product_set
* resource.
* Parses the location from the given fully-qualified path which represents a product resource.
*
* @deprecated Use the {@link ProductSetName} class instead.
* @deprecated Use the {@link ProductName} class instead.
*/
@Deprecated
public static final String parseLocationFromProductSetName(String productSetName) {
return PRODUCT_SET_PATH_TEMPLATE.parse(productSetName).get("location");
public static final String parseLocationFromProductName(String productName) {
return PRODUCT_PATH_TEMPLATE.parse(productName).get("location");
}

/**
* Parses the product_set from the given fully-qualified path which represents a product_set
* resource.
* Parses the product from the given fully-qualified path which represents a product resource.
*
* @deprecated Use the {@link ProductSetName} class instead.
* @deprecated Use the {@link ProductName} class instead.
*/
@Deprecated
public static final String parseProductSetFromProductSetName(String productSetName) {
return PRODUCT_SET_PATH_TEMPLATE.parse(productSetName).get("product_set");
public static final String parseProductFromProductName(String productName) {
return PRODUCT_PATH_TEMPLATE.parse(productName).get("product");
}

/**
* Parses the project from the given fully-qualified path which represents a product resource.
* Parses the project from the given fully-qualified path which represents a product_set resource.
*
* @deprecated Use the {@link ProductName} class instead.
* @deprecated Use the {@link ProductSetName} class instead.
*/
@Deprecated
public static final String parseProjectFromProductName(String productName) {
return PRODUCT_PATH_TEMPLATE.parse(productName).get("project");
public static final String parseProjectFromProductSetName(String productSetName) {
return PRODUCT_SET_PATH_TEMPLATE.parse(productSetName).get("project");
}

/**
* Parses the location from the given fully-qualified path which represents a product resource.
* Parses the location from the given fully-qualified path which represents a product_set
* resource.
*
* @deprecated Use the {@link ProductName} class instead.
* @deprecated Use the {@link ProductSetName} class instead.
*/
@Deprecated
public static final String parseLocationFromProductName(String productName) {
return PRODUCT_PATH_TEMPLATE.parse(productName).get("location");
public static final String parseLocationFromProductSetName(String productSetName) {
return PRODUCT_SET_PATH_TEMPLATE.parse(productSetName).get("location");
}

/**
* Parses the product from the given fully-qualified path which represents a product resource.
* Parses the product_set from the given fully-qualified path which represents a product_set
* resource.
*
* @deprecated Use the {@link ProductName} class instead.
* @deprecated Use the {@link ProductSetName} class instead.
*/
@Deprecated
public static final String parseProductFromProductName(String productName) {
return PRODUCT_PATH_TEMPLATE.parse(productName).get("product");
public static final String parseProductSetFromProductSetName(String productSetName) {
return PRODUCT_SET_PATH_TEMPLATE.parse(productSetName).get("product_set");
}

/**
Expand Down
10 changes: 5 additions & 5 deletions google-cloud-clients/google-cloud-vision/synth.metadata
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"updateTime": "2019-04-02T08:05:11.071368Z",
"updateTime": "2019-04-23T08:02:40.491015Z",
"sources": [
{
"generator": {
"name": "artman",
"version": "0.16.22",
"dockerImage": "googleapis/artman@sha256:e7f9554322a8aa1416c122c918fdc4cdec8cfe816f027fc948dec0be7edef320"
"version": "0.17.0",
"dockerImage": "googleapis/artman@sha256:c58f4ec3838eb4e0718eb1bccc6512bd6850feaa85a360a9e38f6f848ec73bc2"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "6c48ab5aef47dc14e02e2dc718d232a28067129d",
"internalRef": "241437588"
"sha": "547e19e7df398e9290e8e3674d7351efc500f9b0",
"internalRef": "244712781"
}
}
],
Expand Down