() {
- @Override
- public ListEnvironmentsPagedResponse apply(ListEnvironmentsPage input) {
- return new ListEnvironmentsPagedResponse(input);
- }
- },
+ input -> new ListEnvironmentsPagedResponse(input),
MoreExecutors.directExecutor());
}
diff --git a/google-cloud-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/NotebookServiceSettings.java b/google-cloud-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/NotebookServiceSettings.java
index 761f0015..b4ed4fae 100644
--- a/google-cloud-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/NotebookServiceSettings.java
+++ b/google-cloud-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/NotebookServiceSettings.java
@@ -348,14 +348,13 @@ public NotebookServiceStubSettings.Builder getStubSettingsBuilder() {
return ((NotebookServiceStubSettings.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-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/stub/GrpcNotebookServiceStub.java b/google-cloud-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/stub/GrpcNotebookServiceStub.java
index 76d957d6..03e5f6e7 100644
--- a/google-cloud-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/stub/GrpcNotebookServiceStub.java
+++ b/google-cloud-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/stub/GrpcNotebookServiceStub.java
@@ -26,7 +26,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.notebooks.v1beta1.CreateEnvironmentRequest;
import com.google.cloud.notebooks.v1beta1.CreateInstanceRequest;
@@ -60,7 +59,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;
@@ -373,52 +371,40 @@ protected GrpcNotebookServiceStub(
GrpcCallSettings.newBuilder()
.setMethodDescriptor(listInstancesMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListInstancesRequest 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 getInstanceTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getInstanceMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetInstanceRequest 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 createInstanceTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(createInstanceMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(CreateInstanceRequest 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 registerInstanceTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(registerInstanceMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(RegisterInstanceRequest 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
@@ -426,13 +412,10 @@ public Map extract(RegisterInstanceRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(setInstanceAcceleratorMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(SetInstanceAcceleratorRequest 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
@@ -440,91 +423,70 @@ public Map extract(SetInstanceAcceleratorRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(setInstanceMachineTypeMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(SetInstanceMachineTypeRequest 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 setInstanceLabelsTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(setInstanceLabelsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(SetInstanceLabelsRequest 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 deleteInstanceTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(deleteInstanceMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(DeleteInstanceRequest 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 startInstanceTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(startInstanceMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(StartInstanceRequest 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 stopInstanceTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(stopInstanceMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(StopInstanceRequest 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 resetInstanceTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(resetInstanceMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ResetInstanceRequest 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 reportInstanceInfoTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(reportInstanceInfoMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ReportInstanceInfoRequest 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
@@ -533,27 +495,21 @@ public Map extract(ReportInstanceInfoRequest request) {
.newBuilder()
.setMethodDescriptor(isInstanceUpgradeableMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(IsInstanceUpgradeableRequest request) {
- ImmutableMap.Builder params = ImmutableMap.builder();
- params.put(
- "notebook_instance", String.valueOf(request.getNotebookInstance()));
- return params.build();
- }
+ request -> {
+ ImmutableMap.Builder params = ImmutableMap.builder();
+ params.put(
+ "notebook_instance", String.valueOf(request.getNotebookInstance()));
+ return params.build();
})
.build();
GrpcCallSettings upgradeInstanceTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(upgradeInstanceMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(UpgradeInstanceRequest 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
@@ -561,13 +517,10 @@ public Map extract(UpgradeInstanceRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(upgradeInstanceInternalMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(UpgradeInstanceInternalRequest 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
@@ -575,52 +528,40 @@ public Map extract(UpgradeInstanceInternalRequest request) {
GrpcCallSettings.newBuilder()
.setMethodDescriptor(listEnvironmentsMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(ListEnvironmentsRequest 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 getEnvironmentTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(getEnvironmentMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(GetEnvironmentRequest 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 createEnvironmentTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(createEnvironmentMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(CreateEnvironmentRequest 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 deleteEnvironmentTransportSettings =
GrpcCallSettings.newBuilder()
.setMethodDescriptor(deleteEnvironmentMethodDescriptor)
.setParamsExtractor(
- new RequestParamsExtractor() {
- @Override
- public Map extract(DeleteEnvironmentRequest 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();
diff --git a/google-cloud-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/stub/NotebookServiceStubSettings.java b/google-cloud-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/stub/NotebookServiceStubSettings.java
index fea5ea88..43670127 100644
--- a/google-cloud-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/stub/NotebookServiceStubSettings.java
+++ b/google-cloud-notebooks/src/main/java/com/google/cloud/notebooks/v1beta1/stub/NotebookServiceStubSettings.java
@@ -1269,14 +1269,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-notebooks/src/test/java/com/google/cloud/notebooks/v1beta1/NotebookServiceClientTest.java b/google-cloud-notebooks/src/test/java/com/google/cloud/notebooks/v1beta1/NotebookServiceClientTest.java
index 0b44c36e..06fd67e9 100644
--- a/google-cloud-notebooks/src/test/java/com/google/cloud/notebooks/v1beta1/NotebookServiceClientTest.java
+++ b/google-cloud-notebooks/src/test/java/com/google/cloud/notebooks/v1beta1/NotebookServiceClientTest.java
@@ -147,7 +147,7 @@ public void listInstancesExceptionTest() throws Exception {
public void getInstanceTest() throws Exception {
Instance expectedResponse =
Instance.newBuilder()
- .setName(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
+ .setName("name3373707")
.setPostStartupScript("postStartupScript870779112")
.setProxyUri("proxyUri-985185250")
.addAllInstanceOwners(new ArrayList())
@@ -205,7 +205,7 @@ public void getInstanceExceptionTest() throws Exception {
public void createInstanceTest() throws Exception {
Instance expectedResponse =
Instance.newBuilder()
- .setName(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
+ .setName("name3373707")
.setPostStartupScript("postStartupScript870779112")
.setProxyUri("proxyUri-985185250")
.addAllInstanceOwners(new ArrayList())
@@ -283,7 +283,7 @@ public void createInstanceExceptionTest() throws Exception {
public void registerInstanceTest() throws Exception {
Instance expectedResponse =
Instance.newBuilder()
- .setName(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
+ .setName("name3373707")
.setPostStartupScript("postStartupScript870779112")
.setProxyUri("proxyUri-985185250")
.addAllInstanceOwners(new ArrayList())
@@ -358,7 +358,7 @@ public void registerInstanceExceptionTest() throws Exception {
public void setInstanceAcceleratorTest() throws Exception {
Instance expectedResponse =
Instance.newBuilder()
- .setName(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
+ .setName("name3373707")
.setPostStartupScript("postStartupScript870779112")
.setProxyUri("proxyUri-985185250")
.addAllInstanceOwners(new ArrayList())
@@ -435,7 +435,7 @@ public void setInstanceAcceleratorExceptionTest() throws Exception {
public void setInstanceMachineTypeTest() throws Exception {
Instance expectedResponse =
Instance.newBuilder()
- .setName(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
+ .setName("name3373707")
.setPostStartupScript("postStartupScript870779112")
.setProxyUri("proxyUri-985185250")
.addAllInstanceOwners(new ArrayList())
@@ -511,7 +511,7 @@ public void setInstanceMachineTypeExceptionTest() throws Exception {
public void setInstanceLabelsTest() throws Exception {
Instance expectedResponse =
Instance.newBuilder()
- .setName(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
+ .setName("name3373707")
.setPostStartupScript("postStartupScript870779112")
.setProxyUri("proxyUri-985185250")
.addAllInstanceOwners(new ArrayList())
@@ -630,7 +630,7 @@ public void deleteInstanceExceptionTest() throws Exception {
public void startInstanceTest() throws Exception {
Instance expectedResponse =
Instance.newBuilder()
- .setName(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
+ .setName("name3373707")
.setPostStartupScript("postStartupScript870779112")
.setProxyUri("proxyUri-985185250")
.addAllInstanceOwners(new ArrayList())
@@ -697,7 +697,7 @@ public void startInstanceExceptionTest() throws Exception {
public void stopInstanceTest() throws Exception {
Instance expectedResponse =
Instance.newBuilder()
- .setName(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
+ .setName("name3373707")
.setPostStartupScript("postStartupScript870779112")
.setProxyUri("proxyUri-985185250")
.addAllInstanceOwners(new ArrayList())
@@ -763,7 +763,7 @@ public void stopInstanceExceptionTest() throws Exception {
public void resetInstanceTest() throws Exception {
Instance expectedResponse =
Instance.newBuilder()
- .setName(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
+ .setName("name3373707")
.setPostStartupScript("postStartupScript870779112")
.setProxyUri("proxyUri-985185250")
.addAllInstanceOwners(new ArrayList())
@@ -830,7 +830,7 @@ public void resetInstanceExceptionTest() throws Exception {
public void reportInstanceInfoTest() throws Exception {
Instance expectedResponse =
Instance.newBuilder()
- .setName(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
+ .setName("name3373707")
.setPostStartupScript("postStartupScript870779112")
.setProxyUri("proxyUri-985185250")
.addAllInstanceOwners(new ArrayList())
@@ -955,7 +955,7 @@ public void isInstanceUpgradeableExceptionTest() throws Exception {
public void upgradeInstanceTest() throws Exception {
Instance expectedResponse =
Instance.newBuilder()
- .setName(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
+ .setName("name3373707")
.setPostStartupScript("postStartupScript870779112")
.setProxyUri("proxyUri-985185250")
.addAllInstanceOwners(new ArrayList())
@@ -1023,7 +1023,7 @@ public void upgradeInstanceExceptionTest() throws Exception {
public void upgradeInstanceInternalTest() throws Exception {
Instance expectedResponse =
Instance.newBuilder()
- .setName(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
+ .setName("name3373707")
.setPostStartupScript("postStartupScript870779112")
.setProxyUri("proxyUri-985185250")
.addAllInstanceOwners(new ArrayList())
@@ -1155,7 +1155,7 @@ public void listEnvironmentsExceptionTest() throws Exception {
public void getEnvironmentTest() throws Exception {
Environment expectedResponse =
Environment.newBuilder()
- .setName(EnvironmentName.of("[PROJECT]", "[ENVIRONMENT]").toString())
+ .setName("name3373707")
.setDisplayName("displayName1714148973")
.setDescription("description-1724546052")
.setPostStartupScript("postStartupScript870779112")
@@ -1199,7 +1199,7 @@ public void getEnvironmentExceptionTest() throws Exception {
public void createEnvironmentTest() throws Exception {
Environment expectedResponse =
Environment.newBuilder()
- .setName(EnvironmentName.of("[PROJECT]", "[ENVIRONMENT]").toString())
+ .setName("name3373707")
.setDisplayName("displayName1714148973")
.setDescription("description-1724546052")
.setPostStartupScript("postStartupScript870779112")
diff --git a/proto-google-cloud-notebooks-v1beta1/clirr-ignored-differences.xml b/proto-google-cloud-notebooks-v1beta1/clirr-ignored-differences.xml
index cd69cec7..10919cf3 100644
--- a/proto-google-cloud-notebooks-v1beta1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-notebooks-v1beta1/clirr-ignored-differences.xml
@@ -16,4 +16,12 @@
com/google/cloud/notebooks/v1beta1/*OrBuilder
boolean has*(*)
+
+ 8001
+ com/google/cloud/notebooks/v1beta1/Environment*
+
+
+ 8001
+ com/google/cloud/notebooks/v1beta1/Instance*
+
\ No newline at end of file
diff --git a/proto-google-cloud-notebooks-v1beta1/pom.xml b/proto-google-cloud-notebooks-v1beta1/pom.xml
index 7b939ee9..9e32e3fa 100644
--- a/proto-google-cloud-notebooks-v1beta1/pom.xml
+++ b/proto-google-cloud-notebooks-v1beta1/pom.xml
@@ -21,14 +21,6 @@
com.google.api.grpc
proto-google-common-protos