From e027b337ced5fcfb3e1397eb6da18db5859c333f Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Tue, 2 Apr 2019 01:37:22 -0700 Subject: [PATCH] Regenerate vision client (#4867) --- .../cloud/vision/v1/ProductSearchClient.java | 68 +++++++++++++++++-- .../vision/v1/MockImageAnnotatorImpl.java | 2 +- .../vision/v1/MockProductSearchImpl.java | 2 +- .../v1p1beta1/MockImageAnnotatorImpl.java | 2 +- .../v1p2beta1/MockImageAnnotatorImpl.java | 2 +- .../v1p3beta1/MockImageAnnotatorImpl.java | 2 +- .../v1p3beta1/MockProductSearchImpl.java | 2 +- .../v1p4beta1/MockImageAnnotatorImpl.java | 2 +- .../v1p4beta1/MockProductSearchImpl.java | 2 +- .../google-cloud-vision/synth.metadata | 10 +-- 10 files changed, 76 insertions(+), 18 deletions(-) diff --git a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java index ed164149d6a6..af64fe466ce0 100644 --- a/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java +++ b/google-cloud-clients/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java @@ -143,14 +143,24 @@ public class ProductSearchClient implements BackgroundResource { PathTemplate.createWithoutUrlEncoding( "projects/{project}/locations/{location}/products/{product}/referenceImages/{reference_image}"); - /** Formats a string containing the fully-qualified path to represent a location resource. */ + /** + * Formats a string containing the fully-qualified path to represent a location resource. + * + * @deprecated Use the {@link LocationName} class instead. + */ + @Deprecated public static final String formatLocationName(String project, String location) { return LOCATION_PATH_TEMPLATE.instantiate( "project", project, "location", 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_set resource. + * + * @deprecated Use the {@link ProductSetName} class instead. + */ + @Deprecated public static final String formatProductSetName( String project, String location, String productSet) { return PRODUCT_SET_PATH_TEMPLATE.instantiate( @@ -159,7 +169,12 @@ public static final String formatProductSetName( "product_set", productSet); } - /** 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 resource. + * + * @deprecated Use the {@link ProductName} class instead. + */ + @Deprecated public static final String formatProductName(String project, String location, String product) { return PRODUCT_PATH_TEMPLATE.instantiate( "project", project, @@ -169,7 +184,10 @@ public static final String formatProductName(String project, String location, St /** * Formats a string containing the fully-qualified path to represent a reference_image resource. + * + * @deprecated Use the {@link ReferenceImageName} class instead. */ + @Deprecated public static final String formatReferenceImageName( String project, String location, String product, String referenceImage) { return REFERENCE_IMAGE_PATH_TEMPLATE.instantiate( @@ -181,21 +199,30 @@ public static final String formatReferenceImageName( /** * Parses the project from the given fully-qualified path which represents a location resource. + * + * @deprecated Use the {@link LocationName} class instead. */ + @Deprecated public static final String parseProjectFromLocationName(String locationName) { return LOCATION_PATH_TEMPLATE.parse(locationName).get("project"); } /** * Parses the location from the given fully-qualified path which represents a location resource. + * + * @deprecated Use the {@link LocationName} class instead. */ + @Deprecated public static final String parseLocationFromLocationName(String locationName) { return LOCATION_PATH_TEMPLATE.parse(locationName).get("location"); } /** * Parses the project from the given fully-qualified path which represents a product_set resource. + * + * @deprecated Use the {@link ProductSetName} class instead. */ + @Deprecated public static final String parseProjectFromProductSetName(String productSetName) { return PRODUCT_SET_PATH_TEMPLATE.parse(productSetName).get("project"); } @@ -203,7 +230,10 @@ public static final String parseProjectFromProductSetName(String productSetName) /** * Parses the location from the given fully-qualified path which represents a product_set * resource. + * + * @deprecated Use the {@link ProductSetName} class instead. */ + @Deprecated public static final String parseLocationFromProductSetName(String productSetName) { return PRODUCT_SET_PATH_TEMPLATE.parse(productSetName).get("location"); } @@ -211,24 +241,40 @@ public static final String parseLocationFromProductSetName(String productSetName /** * Parses the product_set from the given fully-qualified path which represents a product_set * resource. + * + * @deprecated Use the {@link ProductSetName} class instead. */ + @Deprecated public static final String parseProductSetFromProductSetName(String productSetName) { return PRODUCT_SET_PATH_TEMPLATE.parse(productSetName).get("product_set"); } - /** 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 resource. + * + * @deprecated Use the {@link ProductName} class instead. + */ + @Deprecated 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 resource. + * + * @deprecated Use the {@link ProductName} class instead. */ + @Deprecated public static final String parseLocationFromProductName(String productName) { return PRODUCT_PATH_TEMPLATE.parse(productName).get("location"); } - /** Parses the product from the given fully-qualified path which represents a product resource. */ + /** + * Parses the product from the given fully-qualified path which represents a product resource. + * + * @deprecated Use the {@link ProductName} class instead. + */ + @Deprecated public static final String parseProductFromProductName(String productName) { return PRODUCT_PATH_TEMPLATE.parse(productName).get("product"); } @@ -236,7 +282,10 @@ public static final String parseProductFromProductName(String productName) { /** * Parses the project from the given fully-qualified path which represents a reference_image * resource. + * + * @deprecated Use the {@link ReferenceImageName} class instead. */ + @Deprecated public static final String parseProjectFromReferenceImageName(String referenceImageName) { return REFERENCE_IMAGE_PATH_TEMPLATE.parse(referenceImageName).get("project"); } @@ -244,7 +293,10 @@ public static final String parseProjectFromReferenceImageName(String referenceIm /** * Parses the location from the given fully-qualified path which represents a reference_image * resource. + * + * @deprecated Use the {@link ReferenceImageName} class instead. */ + @Deprecated public static final String parseLocationFromReferenceImageName(String referenceImageName) { return REFERENCE_IMAGE_PATH_TEMPLATE.parse(referenceImageName).get("location"); } @@ -252,7 +304,10 @@ public static final String parseLocationFromReferenceImageName(String referenceI /** * Parses the product from the given fully-qualified path which represents a reference_image * resource. + * + * @deprecated Use the {@link ReferenceImageName} class instead. */ + @Deprecated public static final String parseProductFromReferenceImageName(String referenceImageName) { return REFERENCE_IMAGE_PATH_TEMPLATE.parse(referenceImageName).get("product"); } @@ -260,7 +315,10 @@ public static final String parseProductFromReferenceImageName(String referenceIm /** * Parses the reference_image from the given fully-qualified path which represents a * reference_image resource. + * + * @deprecated Use the {@link ReferenceImageName} class instead. */ + @Deprecated public static final String parseReferenceImageFromReferenceImageName(String referenceImageName) { return REFERENCE_IMAGE_PATH_TEMPLATE.parse(referenceImageName).get("reference_image"); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java index 8073ea26ecf0..49d5c8f45f85 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockImageAnnotatorImpl extends ImageAnnotatorImplBase { - private ArrayList requests; + private List requests; private Queue responses; public MockImageAnnotatorImpl() { diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockProductSearchImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockProductSearchImpl.java index d22b73eeee0c..228c31f69695 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockProductSearchImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockProductSearchImpl.java @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockProductSearchImpl extends ProductSearchImplBase { - private ArrayList requests; + private List requests; private Queue responses; public MockProductSearchImpl() { diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotatorImpl.java index 9bbc89a8f37f..00aa54fa0742 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotatorImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotatorImpl.java @@ -27,7 +27,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockImageAnnotatorImpl extends ImageAnnotatorImplBase { - private ArrayList requests; + private List requests; private Queue responses; public MockImageAnnotatorImpl() { diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotatorImpl.java index b5e6d12ab282..6a3e3a9726a5 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotatorImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotatorImpl.java @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockImageAnnotatorImpl extends ImageAnnotatorImplBase { - private ArrayList requests; + private List requests; private Queue responses; public MockImageAnnotatorImpl() { diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockImageAnnotatorImpl.java index a00843adbc78..55c5252a0c08 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockImageAnnotatorImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockImageAnnotatorImpl.java @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockImageAnnotatorImpl extends ImageAnnotatorImplBase { - private ArrayList requests; + private List requests; private Queue responses; public MockImageAnnotatorImpl() { diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockProductSearchImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockProductSearchImpl.java index 051563972458..a1bed1009dd0 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockProductSearchImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockProductSearchImpl.java @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockProductSearchImpl extends ProductSearchImplBase { - private ArrayList requests; + private List requests; private Queue responses; public MockProductSearchImpl() { diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockImageAnnotatorImpl.java index 77cc1414d177..ff781222c607 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockImageAnnotatorImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockImageAnnotatorImpl.java @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockImageAnnotatorImpl extends ImageAnnotatorImplBase { - private ArrayList requests; + private List requests; private Queue responses; public MockImageAnnotatorImpl() { diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockProductSearchImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockProductSearchImpl.java index 08613f4f39f7..db534f12971a 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockProductSearchImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockProductSearchImpl.java @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockProductSearchImpl extends ProductSearchImplBase { - private ArrayList requests; + private List requests; private Queue responses; public MockProductSearchImpl() { diff --git a/google-cloud-clients/google-cloud-vision/synth.metadata b/google-cloud-clients/google-cloud-vision/synth.metadata index d57e831332d5..7e4e0b733e02 100644 --- a/google-cloud-clients/google-cloud-vision/synth.metadata +++ b/google-cloud-clients/google-cloud-vision/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-30T08:03:24.223672Z", + "updateTime": "2019-04-02T08:05:11.071368Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.21", - "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" + "version": "0.16.22", + "dockerImage": "googleapis/artman@sha256:e7f9554322a8aa1416c122c918fdc4cdec8cfe816f027fc948dec0be7edef320" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "fd67be4b51a8c809b97100ccf1c3cffd15b85d7b", - "internalRef": "241096997" + "sha": "6c48ab5aef47dc14e02e2dc718d232a28067129d", + "internalRef": "241437588" } } ],