fix: update gapic-generator-java with mock service generation fixes

README.md

@@ -50,20 +50,20 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:25.2.0')
+implementation platform('com.google.cloud:libraries-bom:25.4.0')
 
 implementation 'com.google.cloud:google-cloud-vision'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-vision:2.0.29'
+implementation 'com.google.cloud:google-cloud-vision:2.1.1'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-vision" % "2.0.29"
+libraryDependencies += "com.google.cloud" % "google-cloud-vision" % "2.1.1"
 ```
 
 ## Authentication

google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorClient.java

@@ -16,7 +16,6 @@
 
 package com.google.cloud.vision.v1;
 
-import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.rpc.OperationCallable;
@@ -122,7 +121,6 @@ public static final ImageAnnotatorClient create(ImageAnnotatorSettings settings)
    * Constructs an instance of ImageAnnotatorClient, using the given stub for making calls. This is
    * for advanced usage - prefer using create(ImageAnnotatorSettings).
    */
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public static final ImageAnnotatorClient create(ImageAnnotatorStub stub) {
     return new ImageAnnotatorClient(stub);
   }
@@ -138,7 +136,6 @@ protected ImageAnnotatorClient(ImageAnnotatorSettings settings) throws IOExcepti
     this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   protected ImageAnnotatorClient(ImageAnnotatorStub stub) {
     this.settings = null;
     this.stub = stub;
@@ -149,7 +146,6 @@ public final ImageAnnotatorSettings getSettings() {
     return settings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ImageAnnotatorStub getStub() {
     return stub;
   }

google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java

@@ -18,7 +18,6 @@
 
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
-import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.paging.AbstractFixedSizeCollection;
@@ -341,7 +340,6 @@ public static final ProductSearchClient create(ProductSearchSettings settings)
    * Constructs an instance of ProductSearchClient, using the given stub for making calls. This is
    * for advanced usage - prefer using create(ProductSearchSettings).
    */
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public static final ProductSearchClient create(ProductSearchStub stub) {
     return new ProductSearchClient(stub);
   }
@@ -357,7 +355,6 @@ protected ProductSearchClient(ProductSearchSettings settings) throws IOException
     this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   protected ProductSearchClient(ProductSearchStub stub) {
     this.settings = null;
     this.stub = stub;
@@ -368,7 +365,6 @@ public final ProductSearchSettings getSettings() {
     return settings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ProductSearchStub getStub() {
     return stub;
   }
@@ -696,7 +692,7 @@ public final ListProductSetsPagedResponse listProductSets(ListProductSetsRequest
    *   while (true) {
    *     ListProductSetsResponse response =
    *         productSearchClient.listProductSetsCallable().call(request);
-   *     for (ProductSet element : response.getResponsesList()) {
+   *     for (ProductSet element : response.getProductSetsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -1373,7 +1369,7 @@ public final ListProductsPagedResponse listProducts(ListProductsRequest request)
    *           .build();
    *   while (true) {
    *     ListProductsResponse response = productSearchClient.listProductsCallable().call(request);
-   *     for (Product element : response.getResponsesList()) {
+   *     for (Product element : response.getProductsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -2257,7 +2253,7 @@ public final ListReferenceImagesPagedResponse listReferenceImages(
    *   while (true) {
    *     ListReferenceImagesResponse response =
    *         productSearchClient.listReferenceImagesCallable().call(request);
-   *     for (ReferenceImage element : response.getResponsesList()) {
+   *     for (ReferenceImage element : response.getReferenceImagesList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -2981,7 +2977,7 @@ public final ListProductsInProductSetPagedResponse listProductsInProductSet(
    *   while (true) {
    *     ListProductsInProductSetResponse response =
    *         productSearchClient.listProductsInProductSetCallable().call(request);
-   *     for (Product element : response.getResponsesList()) {
+   *     for (Product element : response.getProductsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();

google-cloud-vision/src/main/java/com/google/cloud/vision/v1/package-info.java

@@ -15,7 +15,9 @@
  */
 
 /**
- * The interfaces provided are listed below, along with usage samples.
+ * A client to Cloud Vision API
+ *
+ * <p>The interfaces provided are listed below, along with usage samples.
  *
  * <p>======================= ImageAnnotatorClient =======================
  *

google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java

@@ -150,7 +150,6 @@ public class ImageAnnotatorStubSettings extends StubSettings<ImageAnnotatorStubS
     return asyncBatchAnnotateFilesOperationSettings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ImageAnnotatorStub createStub() throws IOException {
     if (getTransportChannelProvider()
         .getTransportName()

google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ProductSearchStubSettings.java

@@ -526,7 +526,6 @@ public UnaryCallSettings<PurgeProductsRequest, Operation> purgeProductsSettings(
     return purgeProductsOperationSettings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ProductSearchStub createStub() throws IOException {
     if (getTransportChannelProvider()
         .getTransportName()

google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClient.java

@@ -118,7 +118,6 @@ public static final ImageAnnotatorClient create(ImageAnnotatorSettings settings)
    * Constructs an instance of ImageAnnotatorClient, using the given stub for making calls. This is
    * for advanced usage - prefer using create(ImageAnnotatorSettings).
    */
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public static final ImageAnnotatorClient create(ImageAnnotatorStub stub) {
     return new ImageAnnotatorClient(stub);
   }
@@ -133,7 +132,6 @@ protected ImageAnnotatorClient(ImageAnnotatorSettings settings) throws IOExcepti
     this.stub = ((ImageAnnotatorStubSettings) settings.getStubSettings()).createStub();
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   protected ImageAnnotatorClient(ImageAnnotatorStub stub) {
     this.settings = null;
     this.stub = stub;
@@ -143,7 +141,6 @@ public final ImageAnnotatorSettings getSettings() {
     return settings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ImageAnnotatorStub getStub() {
     return stub;
   }

google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java

@@ -95,7 +95,6 @@ public class ImageAnnotatorStubSettings extends StubSettings<ImageAnnotatorStubS
     return batchAnnotateImagesSettings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ImageAnnotatorStub createStub() throws IOException {
     if (getTransportChannelProvider()
         .getTransportName()

google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClient.java

@@ -123,7 +123,6 @@ public static final ImageAnnotatorClient create(ImageAnnotatorSettings settings)
    * Constructs an instance of ImageAnnotatorClient, using the given stub for making calls. This is
    * for advanced usage - prefer using create(ImageAnnotatorSettings).
    */
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public static final ImageAnnotatorClient create(ImageAnnotatorStub stub) {
     return new ImageAnnotatorClient(stub);
   }
@@ -139,7 +138,6 @@ protected ImageAnnotatorClient(ImageAnnotatorSettings settings) throws IOExcepti
     this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   protected ImageAnnotatorClient(ImageAnnotatorStub stub) {
     this.settings = null;
     this.stub = stub;
@@ -150,7 +148,6 @@ public final ImageAnnotatorSettings getSettings() {
     return settings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ImageAnnotatorStub getStub() {
     return stub;
   }

google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java

@@ -121,7 +121,6 @@ public class ImageAnnotatorStubSettings extends StubSettings<ImageAnnotatorStubS
     return asyncBatchAnnotateFilesOperationSettings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ImageAnnotatorStub createStub() throws IOException {
     if (getTransportChannelProvider()
         .getTransportName()

google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorClient.java

@@ -123,7 +123,6 @@ public static final ImageAnnotatorClient create(ImageAnnotatorSettings settings)
    * Constructs an instance of ImageAnnotatorClient, using the given stub for making calls. This is
    * for advanced usage - prefer using create(ImageAnnotatorSettings).
    */
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public static final ImageAnnotatorClient create(ImageAnnotatorStub stub) {
     return new ImageAnnotatorClient(stub);
   }
@@ -139,7 +138,6 @@ protected ImageAnnotatorClient(ImageAnnotatorSettings settings) throws IOExcepti
     this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   protected ImageAnnotatorClient(ImageAnnotatorStub stub) {
     this.settings = null;
     this.stub = stub;
@@ -150,7 +148,6 @@ public final ImageAnnotatorSettings getSettings() {
     return settings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ImageAnnotatorStub getStub() {
     return stub;
   }

google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchClient.java

@@ -146,7 +146,6 @@ public static final ProductSearchClient create(ProductSearchSettings settings)
    * Constructs an instance of ProductSearchClient, using the given stub for making calls. This is
    * for advanced usage - prefer using create(ProductSearchSettings).
    */
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public static final ProductSearchClient create(ProductSearchStub stub) {
     return new ProductSearchClient(stub);
   }
@@ -162,7 +161,6 @@ protected ProductSearchClient(ProductSearchSettings settings) throws IOException
     this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   protected ProductSearchClient(ProductSearchStub stub) {
     this.settings = null;
     this.stub = stub;
@@ -173,7 +171,6 @@ public final ProductSearchSettings getSettings() {
     return settings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ProductSearchStub getStub() {
     return stub;
   }
@@ -501,7 +498,7 @@ public final ListProductSetsPagedResponse listProductSets(ListProductSetsRequest
    *   while (true) {
    *     ListProductSetsResponse response =
    *         productSearchClient.listProductSetsCallable().call(request);
-   *     for (ProductSet element : response.getResponsesList()) {
+   *     for (ProductSet element : response.getProductSetsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -1202,7 +1199,7 @@ public final ListProductsPagedResponse listProducts(ListProductsRequest request)
    *           .build();
    *   while (true) {
    *     ListProductsResponse response = productSearchClient.listProductsCallable().call(request);
-   *     for (Product element : response.getResponsesList()) {
+   *     for (Product element : response.getProductsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -2134,7 +2131,7 @@ public final ListReferenceImagesPagedResponse listReferenceImages(
    *   while (true) {
    *     ListReferenceImagesResponse response =
    *         productSearchClient.listReferenceImagesCallable().call(request);
-   *     for (ReferenceImage element : response.getResponsesList()) {
+   *     for (ReferenceImage element : response.getReferenceImagesList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -2894,7 +2891,7 @@ public final ListProductsInProductSetPagedResponse listProductsInProductSet(
    *   while (true) {
    *     ListProductsInProductSetResponse response =
    *         productSearchClient.listProductsInProductSetCallable().call(request);
-   *     for (Product element : response.getResponsesList()) {
+   *     for (Product element : response.getProductsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();

google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ImageAnnotatorStubSettings.java

@@ -121,7 +121,6 @@ public class ImageAnnotatorStubSettings extends StubSettings<ImageAnnotatorStubS
     return asyncBatchAnnotateFilesOperationSettings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ImageAnnotatorStub createStub() throws IOException {
     if (getTransportChannelProvider()
         .getTransportName()

google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ProductSearchStubSettings.java

@@ -512,7 +512,6 @@ public UnaryCallSettings<ImportProductSetsRequest, Operation> importProductSetsS
     return importProductSetsOperationSettings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ProductSearchStub createStub() throws IOException {
     if (getTransportChannelProvider()
         .getTransportName()

google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ImageAnnotatorClient.java

@@ -123,7 +123,6 @@ public static final ImageAnnotatorClient create(ImageAnnotatorSettings settings)
    * Constructs an instance of ImageAnnotatorClient, using the given stub for making calls. This is
    * for advanced usage - prefer using create(ImageAnnotatorSettings).
    */
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public static final ImageAnnotatorClient create(ImageAnnotatorStub stub) {
     return new ImageAnnotatorClient(stub);
   }
@@ -139,7 +138,6 @@ protected ImageAnnotatorClient(ImageAnnotatorSettings settings) throws IOExcepti
     this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   protected ImageAnnotatorClient(ImageAnnotatorStub stub) {
     this.settings = null;
     this.stub = stub;
@@ -150,7 +148,6 @@ public final ImageAnnotatorSettings getSettings() {
     return settings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ImageAnnotatorStub getStub() {
     return stub;
   }

google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchClient.java

@@ -146,7 +146,6 @@ public static final ProductSearchClient create(ProductSearchSettings settings)
    * Constructs an instance of ProductSearchClient, using the given stub for making calls. This is
    * for advanced usage - prefer using create(ProductSearchSettings).
    */
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public static final ProductSearchClient create(ProductSearchStub stub) {
     return new ProductSearchClient(stub);
   }
@@ -162,7 +161,6 @@ protected ProductSearchClient(ProductSearchSettings settings) throws IOException
     this.operationsClient = OperationsClient.create(this.stub.getOperationsStub());
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   protected ProductSearchClient(ProductSearchStub stub) {
     this.settings = null;
     this.stub = stub;
@@ -173,7 +171,6 @@ public final ProductSearchSettings getSettings() {
     return settings;
   }
 
-  @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ProductSearchStub getStub() {
     return stub;
   }
@@ -501,7 +498,7 @@ public final ListProductSetsPagedResponse listProductSets(ListProductSetsRequest
    *   while (true) {
    *     ListProductSetsResponse response =
    *         productSearchClient.listProductSetsCallable().call(request);
-   *     for (ProductSet element : response.getResponsesList()) {
+   *     for (ProductSet element : response.getProductSetsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -1178,7 +1175,7 @@ public final ListProductsPagedResponse listProducts(ListProductsRequest request)
    *           .build();
    *   while (true) {
    *     ListProductsResponse response = productSearchClient.listProductsCallable().call(request);
-   *     for (Product element : response.getResponsesList()) {
+   *     for (Product element : response.getProductsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -2062,7 +2059,7 @@ public final ListReferenceImagesPagedResponse listReferenceImages(
    *   while (true) {
    *     ListReferenceImagesResponse response =
    *         productSearchClient.listReferenceImagesCallable().call(request);
-   *     for (ReferenceImage element : response.getResponsesList()) {
+   *     for (ReferenceImage element : response.getReferenceImagesList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -2786,7 +2783,7 @@ public final ListProductsInProductSetPagedResponse listProductsInProductSet(
    *   while (true) {
    *     ListProductsInProductSetResponse response =
    *         productSearchClient.listProductsInProductSetCallable().call(request);
-   *     for (Product element : response.getResponsesList()) {
+   *     for (Product element : response.getProductsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();