diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java
index df14ac406..17160ba9d 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java
@@ -193,14 +193,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() {
return ((ImageAnnotatorStubSettings.Builder) getStubSettings());
}
- // NEXT_MAJOR_VER: remove 'throws Exception'.
/**
* Applies the given settings updater function to all of the unary API methods in this service.
*
* Note: This method does not support applying settings to streaming methods.
*/
public Builder applyToAllUnaryMethods(
- ApiFunction, Void> settingsUpdater) throws Exception {
+ ApiFunction, Void> settingsUpdater) {
super.applyToAllUnaryMethods(
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
return this;
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java
index 634b7b70e..5ecec5677 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java
@@ -16,7 +16,6 @@
package com.google.cloud.vision.v1;
-import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
import com.google.api.core.ApiFutures;
import com.google.api.core.BetaApi;
@@ -3300,12 +3299,7 @@ public static ApiFuture createAsync(
ListProductSetsPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
- new ApiFunction() {
- @Override
- public ListProductSetsPagedResponse apply(ListProductSetsPage input) {
- return new ListProductSetsPagedResponse(input);
- }
- },
+ input -> new ListProductSetsPagedResponse(input),
MoreExecutors.directExecutor());
}
@@ -3382,12 +3376,7 @@ public static ApiFuture createAsync(
ListProductsPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
- new ApiFunction() {
- @Override
- public ListProductsPagedResponse apply(ListProductsPage input) {
- return new ListProductsPagedResponse(input);
- }
- },
+ input -> new ListProductsPagedResponse(input),
MoreExecutors.directExecutor());
}
@@ -3463,12 +3452,7 @@ public static ApiFuture createAsync(
ListReferenceImagesPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
- new ApiFunction() {
- @Override
- public ListReferenceImagesPagedResponse apply(ListReferenceImagesPage input) {
- return new ListReferenceImagesPagedResponse(input);
- }
- },
+ input -> new ListReferenceImagesPagedResponse(input),
MoreExecutors.directExecutor());
}
@@ -3552,12 +3536,7 @@ public static ApiFuture createAsync(
ListProductsInProductSetPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
- new ApiFunction() {
- @Override
- public ListProductsInProductSetPagedResponse apply(ListProductsInProductSetPage input) {
- return new ListProductsInProductSetPagedResponse(input);
- }
- },
+ input -> new ListProductsInProductSetPagedResponse(input),
MoreExecutors.directExecutor());
}
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchSettings.java
index a42d214be..e6dc55fe6 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchSettings.java
@@ -278,14 +278,13 @@ public ProductSearchStubSettings.Builder getStubSettingsBuilder() {
return ((ProductSearchStubSettings.Builder) getStubSettings());
}
- // NEXT_MAJOR_VER: remove 'throws Exception'.
/**
* Applies the given settings updater function to all of the unary API methods in this service.
*
* Note: This method does not support applying settings to streaming methods.
*/
public Builder applyToAllUnaryMethods(
- ApiFunction, Void> settingsUpdater) throws Exception {
+ ApiFunction, Void> settingsUpdater) {
super.applyToAllUnaryMethods(
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
return this;
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java
index 0d9a56a6f..6eff5ee22 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java
@@ -22,7 +22,6 @@
import com.google.api.gax.grpc.GrpcStubCallableFactory;
import com.google.api.gax.rpc.ClientContext;
import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.RequestParamsExtractor;
import com.google.api.gax.rpc.UnaryCallable;
import com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest;
import com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse;
@@ -39,7 +38,6 @@
import io.grpc.MethodDescriptor;
import io.grpc.protobuf.ProtoUtils;
import java.io.IOException;
-import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.annotation.Generated;
@@ -157,13 +155,10 @@ protected GrpcImageAnnotatorStub(
GrpcCallSettings.newBuilder()
.setMethodDescriptor(batchAnnotateImagesMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(BatchAnnotateImagesRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -171,13 +166,10 @@ public Map extract(BatchAnnotateImagesRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(batchAnnotateFilesMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(BatchAnnotateFilesRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -185,13 +177,10 @@ public Map extract(BatchAnnotateFilesRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(asyncBatchAnnotateImagesMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(AsyncBatchAnnotateImagesRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -199,13 +188,10 @@ public Map extract(AsyncBatchAnnotateImagesRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(asyncBatchAnnotateFilesMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(AsyncBatchAnnotateFilesRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
@@ -290,7 +276,13 @@ public GrpcOperationsStub getOperationsStub() {
@Override
public final void close() {
- shutdown();
+ try {
+ backgroundResources.close();
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new IllegalStateException("Failed to close resource", e);
+ }
}
@Override
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcProductSearchStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcProductSearchStub.java
index 260d33659..5eaac41fc 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcProductSearchStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcProductSearchStub.java
@@ -27,7 +27,6 @@
import com.google.api.gax.grpc.GrpcStubCallableFactory;
import com.google.api.gax.rpc.ClientContext;
import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.RequestParamsExtractor;
import com.google.api.gax.rpc.UnaryCallable;
import com.google.cloud.vision.v1.AddProductToProductSetRequest;
import com.google.cloud.vision.v1.BatchOperationMetadata;
@@ -64,7 +63,6 @@
import io.grpc.MethodDescriptor;
import io.grpc.protobuf.ProtoUtils;
import java.io.IOException;
-import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.annotation.Generated;
@@ -352,13 +350,10 @@ protected GrpcProductSearchStub(
GrpcCallSettings.newBuilder()
.setMethodDescriptor(createProductSetMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(CreateProductSetRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -366,118 +361,90 @@ public Map extract(CreateProductSetRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(listProductSetsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListProductSetsRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings getProductSetTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getProductSetMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetProductSetRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("name", String.valueOf(request.getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("name", String.valueOf(request.getName()));
+ return params.build();
})
.build();
GrpcCallSettings updateProductSetTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(updateProductSetMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(UpdateProductSetRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put(
- "product_set.name", String.valueOf(request.getProductSet().getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("product_set.name", String.valueOf(request.getProductSet().getName()));
+ return params.build();
})
.build();
GrpcCallSettings deleteProductSetTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(deleteProductSetMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(DeleteProductSetRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("name", String.valueOf(request.getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("name", String.valueOf(request.getName()));
+ return params.build();
})
.build();
GrpcCallSettings createProductTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(createProductMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(CreateProductRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings listProductsTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(listProductsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListProductsRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings getProductTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getProductMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetProductRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("name", String.valueOf(request.getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("name", String.valueOf(request.getName()));
+ return params.build();
})
.build();
GrpcCallSettings updateProductTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(updateProductMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(UpdateProductRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("product.name", String.valueOf(request.getProduct().getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("product.name", String.valueOf(request.getProduct().getName()));
+ return params.build();
})
.build();
GrpcCallSettings deleteProductTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(deleteProductMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(DeleteProductRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("name", String.valueOf(request.getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("name", String.valueOf(request.getName()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -485,26 +452,20 @@ public Map extract(DeleteProductRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(createReferenceImageMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(CreateReferenceImageRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings deleteReferenceImageTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(deleteReferenceImageMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(DeleteReferenceImageRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("name", String.valueOf(request.getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("name", String.valueOf(request.getName()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -512,39 +473,30 @@ public Map extract(DeleteReferenceImageRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(listReferenceImagesMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListReferenceImagesRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings getReferenceImageTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getReferenceImageMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetReferenceImageRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("name", String.valueOf(request.getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("name", String.valueOf(request.getName()));
+ return params.build();
})
.build();
GrpcCallSettings addProductToProductSetTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(addProductToProductSetMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(AddProductToProductSetRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("name", String.valueOf(request.getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("name", String.valueOf(request.getName()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -552,14 +504,10 @@ public Map extract(AddProductToProductSetRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(removeProductFromProductSetMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(
- RemoveProductFromProductSetRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("name", String.valueOf(request.getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("name", String.valueOf(request.getName()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -568,39 +516,30 @@ public Map extract(
.newBuilder()
.setMethodDescriptor(listProductsInProductSetMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListProductsInProductSetRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("name", String.valueOf(request.getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("name", String.valueOf(request.getName()));
+ return params.build();
})
.build();
GrpcCallSettings importProductSetsTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(importProductSetsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ImportProductSetsRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings purgeProductsTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(purgeProductsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(PurgeProductsRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
@@ -850,7 +789,13 @@ public UnaryCallable purgeProductsCallable() {
@Override
public final void close() {
- shutdown();
+ try {
+ backgroundResources.close();
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new IllegalStateException("Failed to close resource", e);
+ }
}
@Override
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java
index 9ec3cc875..8681b4bcc 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java
@@ -412,14 +412,13 @@ private static Builder initDefaults(Builder builder) {
return builder;
}
- // NEXT_MAJOR_VER: remove 'throws Exception'.
/**
* Applies the given settings updater function to all of the unary API methods in this service.
*
* Note: This method does not support applying settings to streaming methods.
*/
public Builder applyToAllUnaryMethods(
- ApiFunction, Void> settingsUpdater) throws Exception {
+ ApiFunction, Void> settingsUpdater) {
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
return this;
}
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ProductSearchStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ProductSearchStubSettings.java
index d8fc18247..f809d2ac4 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ProductSearchStubSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ProductSearchStubSettings.java
@@ -982,14 +982,13 @@ private static Builder initDefaults(Builder builder) {
return builder;
}
- // NEXT_MAJOR_VER: remove 'throws Exception'.
/**
* Applies the given settings updater function to all of the unary API methods in this service.
*
* Note: This method does not support applying settings to streaming methods.
*/
public Builder applyToAllUnaryMethods(
- ApiFunction, Void> settingsUpdater) throws Exception {
+ ApiFunction, Void> settingsUpdater) {
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
return this;
}
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java
index 03965d482..167e721b9 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java
@@ -158,14 +158,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() {
return ((ImageAnnotatorStubSettings.Builder) getStubSettings());
}
- // NEXT_MAJOR_VER: remove 'throws Exception'.
/**
* Applies the given settings updater function to all of the unary API methods in this service.
*
* Note: This method does not support applying settings to streaming methods.
*/
public Builder applyToAllUnaryMethods(
- ApiFunction, Void> settingsUpdater) throws Exception {
+ ApiFunction, Void> settingsUpdater) {
super.applyToAllUnaryMethods(
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
return this;
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java
index 2579fd8c1..251f45c95 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java
@@ -127,7 +127,13 @@ public GrpcOperationsStub getOperationsStub() {
@Override
public final void close() {
- shutdown();
+ try {
+ backgroundResources.close();
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new IllegalStateException("Failed to close resource", e);
+ }
}
@Override
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java
index daadc1a09..68ea7e3e8 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java
@@ -253,14 +253,13 @@ private static Builder initDefaults(Builder builder) {
return builder;
}
- // NEXT_MAJOR_VER: remove 'throws Exception'.
/**
* Applies the given settings updater function to all of the unary API methods in this service.
*
* Note: This method does not support applying settings to streaming methods.
*/
public Builder applyToAllUnaryMethods(
- ApiFunction, Void> settingsUpdater) throws Exception {
+ ApiFunction, Void> settingsUpdater) {
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
return this;
}
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java
index 1ea4e1c1b..5a01dcec9 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java
@@ -174,14 +174,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() {
return ((ImageAnnotatorStubSettings.Builder) getStubSettings());
}
- // NEXT_MAJOR_VER: remove 'throws Exception'.
/**
* Applies the given settings updater function to all of the unary API methods in this service.
*
* Note: This method does not support applying settings to streaming methods.
*/
public Builder applyToAllUnaryMethods(
- ApiFunction, Void> settingsUpdater) throws Exception {
+ ApiFunction, Void> settingsUpdater) {
super.applyToAllUnaryMethods(
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
return this;
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java
index d4ec7b72d..7a2f78b4a 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java
@@ -177,7 +177,13 @@ public GrpcOperationsStub getOperationsStub() {
@Override
public final void close() {
- shutdown();
+ try {
+ backgroundResources.close();
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new IllegalStateException("Failed to close resource", e);
+ }
}
@Override
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java
index c6851e9dd..bbec54696 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java
@@ -324,14 +324,13 @@ private static Builder initDefaults(Builder builder) {
return builder;
}
- // NEXT_MAJOR_VER: remove 'throws Exception'.
/**
* Applies the given settings updater function to all of the unary API methods in this service.
*
* Note: This method does not support applying settings to streaming methods.
*/
public Builder applyToAllUnaryMethods(
- ApiFunction, Void> settingsUpdater) throws Exception {
+ ApiFunction, Void> settingsUpdater) {
super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
return this;
}
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorSettings.java
index e1a75a263..0d72ff62b 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorSettings.java
@@ -174,14 +174,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() {
return ((ImageAnnotatorStubSettings.Builder) getStubSettings());
}
- // NEXT_MAJOR_VER: remove 'throws Exception'.
/**
* Applies the given settings updater function to all of the unary API methods in this service.
*
* Note: This method does not support applying settings to streaming methods.
*/
public Builder applyToAllUnaryMethods(
- ApiFunction, Void> settingsUpdater) throws Exception {
+ ApiFunction, Void> settingsUpdater) {
super.applyToAllUnaryMethods(
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
return this;
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchClient.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchClient.java
index 3f091dd4d..aa2c72308 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchClient.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchClient.java
@@ -16,7 +16,6 @@
package com.google.cloud.vision.v1p3beta1;
-import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
import com.google.api.core.ApiFutures;
import com.google.api.core.BetaApi;
@@ -2987,12 +2986,7 @@ public static ApiFuture createAsync(
ListProductSetsPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
- new ApiFunction() {
- @Override
- public ListProductSetsPagedResponse apply(ListProductSetsPage input) {
- return new ListProductSetsPagedResponse(input);
- }
- },
+ input -> new ListProductSetsPagedResponse(input),
MoreExecutors.directExecutor());
}
@@ -3069,12 +3063,7 @@ public static ApiFuture createAsync(
ListProductsPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
- new ApiFunction() {
- @Override
- public ListProductsPagedResponse apply(ListProductsPage input) {
- return new ListProductsPagedResponse(input);
- }
- },
+ input -> new ListProductsPagedResponse(input),
MoreExecutors.directExecutor());
}
@@ -3150,12 +3139,7 @@ public static ApiFuture createAsync(
ListReferenceImagesPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
- new ApiFunction() {
- @Override
- public ListReferenceImagesPagedResponse apply(ListReferenceImagesPage input) {
- return new ListReferenceImagesPagedResponse(input);
- }
- },
+ input -> new ListReferenceImagesPagedResponse(input),
MoreExecutors.directExecutor());
}
@@ -3239,12 +3223,7 @@ public static ApiFuture createAsync(
ListProductsInProductSetPage.createEmptyPage().createPageAsync(context, futureResponse);
return ApiFutures.transform(
futurePage,
- new ApiFunction() {
- @Override
- public ListProductsInProductSetPagedResponse apply(ListProductsInProductSetPage input) {
- return new ListProductsInProductSetPagedResponse(input);
- }
- },
+ input -> new ListProductsInProductSetPagedResponse(input),
MoreExecutors.directExecutor());
}
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchSettings.java
index bbc6ed14d..270cd78be 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchSettings.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchSettings.java
@@ -268,14 +268,13 @@ public ProductSearchStubSettings.Builder getStubSettingsBuilder() {
return ((ProductSearchStubSettings.Builder) getStubSettings());
}
- // NEXT_MAJOR_VER: remove 'throws Exception'.
/**
* Applies the given settings updater function to all of the unary API methods in this service.
*
* Note: This method does not support applying settings to streaming methods.
*/
public Builder applyToAllUnaryMethods(
- ApiFunction, Void> settingsUpdater) throws Exception {
+ ApiFunction, Void> settingsUpdater) {
super.applyToAllUnaryMethods(
getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
return this;
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcImageAnnotatorStub.java
index a569566d0..b4044b61e 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcImageAnnotatorStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcImageAnnotatorStub.java
@@ -177,7 +177,13 @@ public GrpcOperationsStub getOperationsStub() {
@Override
public final void close() {
- shutdown();
+ try {
+ backgroundResources.close();
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new IllegalStateException("Failed to close resource", e);
+ }
}
@Override
diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcProductSearchStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcProductSearchStub.java
index 3569f2903..7943bb7d5 100644
--- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcProductSearchStub.java
+++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcProductSearchStub.java
@@ -28,7 +28,6 @@
import com.google.api.gax.grpc.GrpcStubCallableFactory;
import com.google.api.gax.rpc.ClientContext;
import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.RequestParamsExtractor;
import com.google.api.gax.rpc.UnaryCallable;
import com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest;
import com.google.cloud.vision.v1p3beta1.BatchOperationMetadata;
@@ -64,7 +63,6 @@
import io.grpc.MethodDescriptor;
import io.grpc.protobuf.ProtoUtils;
import java.io.IOException;
-import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.annotation.Generated;
@@ -343,13 +341,10 @@ protected GrpcProductSearchStub(
GrpcCallSettings.newBuilder()
.setMethodDescriptor(createProductSetMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(CreateProductSetRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -357,118 +352,90 @@ public Map extract(CreateProductSetRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(listProductSetsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListProductSetsRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings getProductSetTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getProductSetMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetProductSetRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("name", String.valueOf(request.getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("name", String.valueOf(request.getName()));
+ return params.build();
})
.build();
GrpcCallSettings updateProductSetTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(updateProductSetMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(UpdateProductSetRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put(
- "product_set.name", String.valueOf(request.getProductSet().getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("product_set.name", String.valueOf(request.getProductSet().getName()));
+ return params.build();
})
.build();
GrpcCallSettings deleteProductSetTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(deleteProductSetMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(DeleteProductSetRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("name", String.valueOf(request.getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("name", String.valueOf(request.getName()));
+ return params.build();
})
.build();
GrpcCallSettings createProductTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(createProductMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(CreateProductRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings listProductsTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(listProductsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListProductsRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("parent", String.valueOf(request.getParent()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("parent", String.valueOf(request.getParent()));
+ return params.build();
})
.build();
GrpcCallSettings getProductTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getProductMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetProductRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("name", String.valueOf(request.getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("name", String.valueOf(request.getName()));
+ return params.build();
})
.build();
GrpcCallSettings updateProductTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(updateProductMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(UpdateProductRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("product.name", String.valueOf(request.getProduct().getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("product.name", String.valueOf(request.getProduct().getName()));
+ return params.build();
})
.build();
GrpcCallSettings deleteProductTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(deleteProductMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(DeleteProductRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put("name", String.valueOf(request.getName()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put("name", String.valueOf(request.getName()));
+ return params.build();
})
.build();
GrpcCallSettings
@@ -476,26 +443,20 @@ public Map