() {
- @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 9d93277b..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();
@@ -992,7 +933,13 @@ public UnaryCallable deleteEnvironmentCalla
@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-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/grpc-google-cloud-notebooks-v1beta1/pom.xml b/grpc-google-cloud-notebooks-v1beta1/pom.xml
index c7008970..667d2df9 100644
--- a/grpc-google-cloud-notebooks-v1beta1/pom.xml
+++ b/grpc-google-cloud-notebooks-v1beta1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-notebooks-v1beta1
- 0.3.0
+ 0.4.0
grpc-google-cloud-notebooks-v1beta1
GRPC library for grpc-google-cloud-notebooks-v1beta1
com.google.cloud
google-cloud-notebooks-parent
- 0.3.0
+ 0.4.0
diff --git a/java.header b/java.header
index 3a9b503a..d0970ba7 100644
--- a/java.header
+++ b/java.header
@@ -1,5 +1,5 @@
^/\*$
-^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)( All [rR]ights [rR]eserved\.)?$
+^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)$
^ \*$
^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\);$
^ \* you may not use this file except in compliance with the License\.$
diff --git a/owlbot.py b/owlbot.py
new file mode 100644
index 00000000..dca9d867
--- /dev/null
+++ b/owlbot.py
@@ -0,0 +1,24 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import synthtool as s
+from synthtool.languages import java
+
+
+for library in s.get_staging_dirs():
+ # put any special-case replacements here
+ s.move(library)
+
+s.remove_staging_dirs()
+java.common_templates()
diff --git a/pom.xml b/pom.xml
index 4a85865d..7ed02d51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-notebooks-parent
pom
- 0.3.0
+ 0.4.0
Google AI Platform Notebooks Parent
https://github.com/googleapis/java-notebooks
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 0.12.0
+ 1.0.0
@@ -41,16 +41,7 @@
https://github.com/googleapis/java-notebooks/issues
GitHub Issues
-
-
- sonatype-nexus-snapshots
- https://oss.sonatype.org/content/repositories/snapshots
-
-
- sonatype-nexus-staging
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
-
-
+
Apache-2.0
@@ -70,23 +61,23 @@
com.google.cloud
google-cloud-notebooks
- 0.3.0
+ 0.4.0
com.google.api.grpc
proto-google-cloud-notebooks-v1beta1
- 0.3.0
+ 0.4.0
com.google.api.grpc
grpc-google-cloud-notebooks-v1beta1
- 0.3.0
+ 0.4.0
com.google.cloud
google-cloud-shared-dependencies
- 1.3.0
+ 2.0.0
pom
import
@@ -119,8 +110,8 @@
google-cloud-notebooks
- proto-google-cloud-notebooks-v1beta1
grpc-google-cloud-notebooks-v1beta1
+ proto-google-cloud-notebooks-v1beta1
google-cloud-notebooks-bom
@@ -193,4 +184,4 @@
-
\ No newline at end of file
+
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 3cc8fa7e..ddb4a01d 100644
--- a/proto-google-cloud-notebooks-v1beta1/pom.xml
+++ b/proto-google-cloud-notebooks-v1beta1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-notebooks-v1beta1
- 0.3.0
+ 0.4.0
proto-google-cloud-notebooks-v1beta1
PROTO library for proto-google-cloud-notebooks-v1beta1
com.google.cloud
google-cloud-notebooks-parent
- 0.3.0
+ 0.4.0
@@ -21,14 +21,6 @@
com.google.api.grpc
proto-google-common-protos
-
- com.google.api
- api-common
-
-
- com.google.guava
- guava
-
diff --git a/proto-google-cloud-notebooks-v1beta1/src/main/java/com/google/cloud/notebooks/v1beta1/EnvironmentName.java b/proto-google-cloud-notebooks-v1beta1/src/main/java/com/google/cloud/notebooks/v1beta1/EnvironmentName.java
deleted file mode 100644
index c7f15af9..00000000
--- a/proto-google-cloud-notebooks-v1beta1/src/main/java/com/google/cloud/notebooks/v1beta1/EnvironmentName.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.cloud.notebooks.v1beta1;
-
-import com.google.api.pathtemplate.PathTemplate;
-import com.google.api.resourcenames.ResourceName;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import javax.annotation.Generated;
-
-// AUTO-GENERATED DOCUMENTATION AND CLASS.
-@Generated("by gapic-generator-java")
-public class EnvironmentName implements ResourceName {
- private static final PathTemplate PROJECT_ENVIRONMENT =
- PathTemplate.createWithoutUrlEncoding("projects/{project}/environments/{environment}");
- private volatile Map fieldValuesMap;
- private final String project;
- private final String environment;
-
- @Deprecated
- protected EnvironmentName() {
- project = null;
- environment = null;
- }
-
- private EnvironmentName(Builder builder) {
- project = Preconditions.checkNotNull(builder.getProject());
- environment = Preconditions.checkNotNull(builder.getEnvironment());
- }
-
- public String getProject() {
- return project;
- }
-
- public String getEnvironment() {
- return environment;
- }
-
- public static Builder newBuilder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder(this);
- }
-
- public static EnvironmentName of(String project, String environment) {
- return newBuilder().setProject(project).setEnvironment(environment).build();
- }
-
- public static String format(String project, String environment) {
- return newBuilder().setProject(project).setEnvironment(environment).build().toString();
- }
-
- public static EnvironmentName parse(String formattedString) {
- if (formattedString.isEmpty()) {
- return null;
- }
- Map matchMap =
- PROJECT_ENVIRONMENT.validatedMatch(
- formattedString, "EnvironmentName.parse: formattedString not in valid format");
- return of(matchMap.get("project"), matchMap.get("environment"));
- }
-
- public static List parseList(List formattedStrings) {
- List list = new ArrayList<>(formattedStrings.size());
- for (String formattedString : formattedStrings) {
- list.add(parse(formattedString));
- }
- return list;
- }
-
- public static List toStringList(List values) {
- List list = new ArrayList<>(values.size());
- for (EnvironmentName value : values) {
- if (value == null) {
- list.add("");
- } else {
- list.add(value.toString());
- }
- }
- return list;
- }
-
- public static boolean isParsableFrom(String formattedString) {
- return PROJECT_ENVIRONMENT.matches(formattedString);
- }
-
- @Override
- public Map getFieldValuesMap() {
- if (fieldValuesMap == null) {
- synchronized (this) {
- if (fieldValuesMap == null) {
- ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
- if (project != null) {
- fieldMapBuilder.put("project", project);
- }
- if (environment != null) {
- fieldMapBuilder.put("environment", environment);
- }
- fieldValuesMap = fieldMapBuilder.build();
- }
- }
- }
- return fieldValuesMap;
- }
-
- public String getFieldValue(String fieldName) {
- return getFieldValuesMap().get(fieldName);
- }
-
- @Override
- public String toString() {
- return PROJECT_ENVIRONMENT.instantiate("project", project, "environment", environment);
- }
-
- @Override
- public boolean equals(Object o) {
- if (o == this) {
- return true;
- }
- if (o != null || getClass() == o.getClass()) {
- EnvironmentName that = ((EnvironmentName) o);
- return Objects.equals(this.project, that.project)
- && Objects.equals(this.environment, that.environment);
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- int h = 1;
- h *= 1000003;
- h ^= Objects.hashCode(project);
- h *= 1000003;
- h ^= Objects.hashCode(environment);
- return h;
- }
-
- /** Builder for projects/{project}/environments/{environment}. */
- public static class Builder {
- private String project;
- private String environment;
-
- protected Builder() {}
-
- public String getProject() {
- return project;
- }
-
- public String getEnvironment() {
- return environment;
- }
-
- public Builder setProject(String project) {
- this.project = project;
- return this;
- }
-
- public Builder setEnvironment(String environment) {
- this.environment = environment;
- return this;
- }
-
- private Builder(EnvironmentName environmentName) {
- this.project = environmentName.project;
- this.environment = environmentName.environment;
- }
-
- public EnvironmentName build() {
- return new EnvironmentName(this);
- }
- }
-}
diff --git a/proto-google-cloud-notebooks-v1beta1/src/main/java/com/google/cloud/notebooks/v1beta1/InstanceName.java b/proto-google-cloud-notebooks-v1beta1/src/main/java/com/google/cloud/notebooks/v1beta1/InstanceName.java
deleted file mode 100644
index fcfb9d32..00000000
--- a/proto-google-cloud-notebooks-v1beta1/src/main/java/com/google/cloud/notebooks/v1beta1/InstanceName.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.cloud.notebooks.v1beta1;
-
-import com.google.api.pathtemplate.PathTemplate;
-import com.google.api.resourcenames.ResourceName;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import javax.annotation.Generated;
-
-// AUTO-GENERATED DOCUMENTATION AND CLASS.
-@Generated("by gapic-generator-java")
-public class InstanceName implements ResourceName {
- private static final PathTemplate PROJECT_INSTANCE =
- PathTemplate.createWithoutUrlEncoding("projects/{project}/instances/{instance}");
- private volatile Map fieldValuesMap;
- private final String project;
- private final String instance;
-
- @Deprecated
- protected InstanceName() {
- project = null;
- instance = null;
- }
-
- private InstanceName(Builder builder) {
- project = Preconditions.checkNotNull(builder.getProject());
- instance = Preconditions.checkNotNull(builder.getInstance());
- }
-
- public String getProject() {
- return project;
- }
-
- public String getInstance() {
- return instance;
- }
-
- public static Builder newBuilder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder(this);
- }
-
- public static InstanceName of(String project, String instance) {
- return newBuilder().setProject(project).setInstance(instance).build();
- }
-
- public static String format(String project, String instance) {
- return newBuilder().setProject(project).setInstance(instance).build().toString();
- }
-
- public static InstanceName parse(String formattedString) {
- if (formattedString.isEmpty()) {
- return null;
- }
- Map matchMap =
- PROJECT_INSTANCE.validatedMatch(
- formattedString, "InstanceName.parse: formattedString not in valid format");
- return of(matchMap.get("project"), matchMap.get("instance"));
- }
-
- public static List parseList(List formattedStrings) {
- List list = new ArrayList<>(formattedStrings.size());
- for (String formattedString : formattedStrings) {
- list.add(parse(formattedString));
- }
- return list;
- }
-
- public static List toStringList(List values) {
- List list = new ArrayList<>(values.size());
- for (InstanceName value : values) {
- if (value == null) {
- list.add("");
- } else {
- list.add(value.toString());
- }
- }
- return list;
- }
-
- public static boolean isParsableFrom(String formattedString) {
- return PROJECT_INSTANCE.matches(formattedString);
- }
-
- @Override
- public Map getFieldValuesMap() {
- if (fieldValuesMap == null) {
- synchronized (this) {
- if (fieldValuesMap == null) {
- ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder();
- if (project != null) {
- fieldMapBuilder.put("project", project);
- }
- if (instance != null) {
- fieldMapBuilder.put("instance", instance);
- }
- fieldValuesMap = fieldMapBuilder.build();
- }
- }
- }
- return fieldValuesMap;
- }
-
- public String getFieldValue(String fieldName) {
- return getFieldValuesMap().get(fieldName);
- }
-
- @Override
- public String toString() {
- return PROJECT_INSTANCE.instantiate("project", project, "instance", instance);
- }
-
- @Override
- public boolean equals(Object o) {
- if (o == this) {
- return true;
- }
- if (o != null || getClass() == o.getClass()) {
- InstanceName that = ((InstanceName) o);
- return Objects.equals(this.project, that.project)
- && Objects.equals(this.instance, that.instance);
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- int h = 1;
- h *= 1000003;
- h ^= Objects.hashCode(project);
- h *= 1000003;
- h ^= Objects.hashCode(instance);
- return h;
- }
-
- /** Builder for projects/{project}/instances/{instance}. */
- public static class Builder {
- private String project;
- private String instance;
-
- protected Builder() {}
-
- public String getProject() {
- return project;
- }
-
- public String getInstance() {
- return instance;
- }
-
- public Builder setProject(String project) {
- this.project = project;
- return this;
- }
-
- public Builder setInstance(String instance) {
- this.instance = instance;
- return this;
- }
-
- private Builder(InstanceName instanceName) {
- this.project = instanceName.project;
- this.instance = instanceName.instance;
- }
-
- public InstanceName build() {
- return new InstanceName(this);
- }
- }
-}
diff --git a/renovate.json b/renovate.json
index 5c10b672..2f5b2f4c 100644
--- a/renovate.json
+++ b/renovate.json
@@ -69,5 +69,8 @@
}
],
"semanticCommits": true,
- "masterIssue": true
+ "dependencyDashboard": true,
+ "dependencyDashboardLabels": [
+ "type: process"
+ ]
}
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 955c675b..b13d9b11 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
com.google.cloud
google-cloud-notebooks
- 0.2.6
+ 0.3.0
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f6bedf6e..7d5cc2e3 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-notebooks
- 0.3.0
+ 0.4.0
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 7e154c9d..367844c6 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-notebooks
- 0.2.6
+ 0.3.0
diff --git a/synth.metadata b/synth.metadata
index 7cd8a298..5e97872a 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-notebooks.git",
- "sha": "54c3021955d2308d37a2a16701524b7ec7de6f71"
+ "sha": "c28fe5f23b3a9d903be86edb04da0874c02e395c"
}
},
{
@@ -19,7 +19,7 @@
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
- "sha": "8f76a885deaaf2fe234daeba4a8cc4d1b3de8086"
+ "sha": "5d3c52f5db664eee9026db76b5bcb466f3a09ca9"
}
}
],
diff --git a/synth.py b/synth.py
deleted file mode 100644
index 0b4bcd1a..00000000
--- a/synth.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""This script is used to synthesize generated parts of this library."""
-
-import synthtool as s
-import synthtool.gcp as gcp
-import synthtool.languages.java as java
-
-service = 'notebooks'
-versions = ['v1beta1']
-
-for version in versions:
- java.bazel_library(
- service=service,
- version=version,
- proto_path=f'google/cloud/{service}/{version}',
- bazel_target=f'//google/cloud/{service}/{version}:google-cloud-{service}-{version}-java',
- )
-
-java.common_templates()
\ No newline at end of file
diff --git a/versions.txt b/versions.txt
index f84f6763..37150f00 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,6 +1,6 @@
# Format:
# module:released-version:current-version
-google-cloud-notebooks:0.3.0:0.3.0
-proto-google-cloud-notebooks-v1beta1:0.3.0:0.3.0
-grpc-google-cloud-notebooks-v1beta1:0.3.0:0.3.0
\ No newline at end of file
+google-cloud-notebooks:0.4.0:0.4.0
+grpc-google-cloud-notebooks-v1beta1:0.4.0:0.4.0
+proto-google-cloud-notebooks-v1beta1:0.4.0:0.4.0